add new device info

Kyun-J · Mar 28, 2022 · 435c995 · 435c995
1 parent 5aed9c9
commit 435c995
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/FlexHybridApp.podspec b/FlexHybridApp.podspec
@@ -9,10 +9,10 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "FlexHybridApp"
-  spec.version      = "1.0.3"
+  spec.version      = "1.0.4"
   spec.summary      = "FlexibleHybridApp-iOS"
   spec.ios.deployment_target = '10.0'
-  spec.swift_version = '5.5.2'
+  spec.swift_version = '5.6'
   spec.author        = { "Kyun-J" => "dvkyun@gmail.com" }
   spec.source       = { :git => "https://github.com/Kyun-J/FlexHybridApp-iOS.git", :tag => "#{spec.version}" }
   spec.license      = { :type => "BSD", :file => "license" }

diff --git a/framework/flexhybridapp.xcodeproj/project.pbxproj b/framework/flexhybridapp.xcodeproj/project.pbxproj
@@ -342,7 +342,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 7V78M894K4;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -357,7 +357,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = app.dvkyun.flexhybridapp;
 				PRODUCT_NAME = FlexHybridApp;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -379,7 +379,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -394,7 +394,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = app.dvkyun.flexhybridapp;
 				PRODUCT_NAME = FlexHybridApp;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/framework/flexhybridapp/util/DeviceInfo.swift b/framework/flexhybridapp/util/DeviceInfo.swift
@@ -56,22 +56,6 @@ struct DeviceInfo {
         let identifier = self.getDeviceIdentifier()
 
         switch identifier {
-        case "iPhone1,1" :
-            return "iPhone"
-        case "iPhone1,2" :
-            return "iPhone3G"
-        case "iPhone2,1" :
-            return "iPhone3GS"
-        case "iPhone3,1", "iPhone3,2", "iPhone3,3" :
-            return "iPhone4"
-        case "iPhone4,1" :
-            return "iPhone4s"
-        case "iPhone5,1", "iPhone5,2" :
-            return "iPhone5"
-        case "iPhone5,3", "iPhone5,4" :
-            return "iPhone5c"
-        case "iPhone6,1", "iPhone6,2" :
-            return "iPhone5s"
         case "iPhone7,2" :
             return "iPhone6"
         case "iPhone7,1" :
@@ -120,6 +104,8 @@ struct DeviceInfo {
             return "iPhone_13_Pro"
         case "iPhone14,3":
             return "iPhone_13_Pro_Max"
+        case "iPhone14,6":
+            return "iPhone_SE_3rd_Generation"
         default:
             return "Unknown_iPhone_\(identifier)"
         }
@@ -171,6 +157,8 @@ struct DeviceInfo {
             return "iPad_Air3"
         case "iPad13,1", "iPad13,2" :
             return "iPad_Air4"
+        case "iPad13,16", "iPad13,17" :
+            return "iPad_Air5"
 
         case "iPad6,7", "iPad6,8" :
             return "iPad_Pro_12.9"
@@ -189,7 +177,7 @@ struct DeviceInfo {
         case "iPad8,11", "iPad8,12" :
             return "iPad_Pro_12.9_4th_Generation"
         case "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7" :
-            return "iPad_Pro_11_3nd_Generation"
+            return "iPad_Pro_11_3rd_Generation"
         case "iPad13,8", "iPad13,9", "iPad13,10", "iPad13,11" :
             return "iPad_Pro_12.9_5th_Generation"