Skip to content

Commit 435c995

Browse files
committed
add new device info
1 parent 5aed9c9 commit 435c995

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

FlexHybridApp.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
Pod::Spec.new do |spec|
1010

1111
spec.name = "FlexHybridApp"
12-
spec.version = "1.0.3"
12+
spec.version = "1.0.4"
1313
spec.summary = "FlexibleHybridApp-iOS"
1414
spec.ios.deployment_target = '10.0'
15-
spec.swift_version = '5.5.2'
15+
spec.swift_version = '5.6'
1616
spec.author = { "Kyun-J" => "[email protected]" }
1717
spec.source = { :git => "https://github.com/Kyun-J/FlexHybridApp-iOS.git", :tag => "#{spec.version}" }
1818
spec.license = { :type => "BSD", :file => "license" }

framework/flexhybridapp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
CLANG_ENABLE_MODULES = YES;
343343
CODE_SIGN_IDENTITY = "Apple Development";
344344
CODE_SIGN_STYLE = Automatic;
345-
CURRENT_PROJECT_VERSION = 33;
345+
CURRENT_PROJECT_VERSION = 34;
346346
DEFINES_MODULE = YES;
347347
DEVELOPMENT_TEAM = 7V78M894K4;
348348
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -357,7 +357,7 @@
357357
"@loader_path/Frameworks",
358358
);
359359
MACOSX_DEPLOYMENT_TARGET = 11.0;
360-
MARKETING_VERSION = 1.0.3;
360+
MARKETING_VERSION = 1.0.4;
361361
PRODUCT_BUNDLE_IDENTIFIER = app.dvkyun.flexhybridapp;
362362
PRODUCT_NAME = FlexHybridApp;
363363
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -379,7 +379,7 @@
379379
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
380380
CLANG_ENABLE_MODULES = YES;
381381
CODE_SIGN_STYLE = Manual;
382-
CURRENT_PROJECT_VERSION = 33;
382+
CURRENT_PROJECT_VERSION = 34;
383383
DEFINES_MODULE = YES;
384384
DEVELOPMENT_TEAM = "";
385385
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -394,7 +394,7 @@
394394
"@loader_path/Frameworks",
395395
);
396396
MACOSX_DEPLOYMENT_TARGET = 11.0;
397-
MARKETING_VERSION = 1.0.3;
397+
MARKETING_VERSION = 1.0.4;
398398
PRODUCT_BUNDLE_IDENTIFIER = app.dvkyun.flexhybridapp;
399399
PRODUCT_NAME = FlexHybridApp;
400400
PROVISIONING_PROFILE_SPECIFIER = "";

framework/flexhybridapp/util/DeviceInfo.swift

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,6 @@ struct DeviceInfo {
5656
let identifier = self.getDeviceIdentifier()
5757

5858
switch identifier {
59-
case "iPhone1,1" :
60-
return "iPhone"
61-
case "iPhone1,2" :
62-
return "iPhone3G"
63-
case "iPhone2,1" :
64-
return "iPhone3GS"
65-
case "iPhone3,1", "iPhone3,2", "iPhone3,3" :
66-
return "iPhone4"
67-
case "iPhone4,1" :
68-
return "iPhone4s"
69-
case "iPhone5,1", "iPhone5,2" :
70-
return "iPhone5"
71-
case "iPhone5,3", "iPhone5,4" :
72-
return "iPhone5c"
73-
case "iPhone6,1", "iPhone6,2" :
74-
return "iPhone5s"
7559
case "iPhone7,2" :
7660
return "iPhone6"
7761
case "iPhone7,1" :
@@ -120,6 +104,8 @@ struct DeviceInfo {
120104
return "iPhone_13_Pro"
121105
case "iPhone14,3":
122106
return "iPhone_13_Pro_Max"
107+
case "iPhone14,6":
108+
return "iPhone_SE_3rd_Generation"
123109
default:
124110
return "Unknown_iPhone_\(identifier)"
125111
}
@@ -171,6 +157,8 @@ struct DeviceInfo {
171157
return "iPad_Air3"
172158
case "iPad13,1", "iPad13,2" :
173159
return "iPad_Air4"
160+
case "iPad13,16", "iPad13,17" :
161+
return "iPad_Air5"
174162

175163
case "iPad6,7", "iPad6,8" :
176164
return "iPad_Pro_12.9"
@@ -189,7 +177,7 @@ struct DeviceInfo {
189177
case "iPad8,11", "iPad8,12" :
190178
return "iPad_Pro_12.9_4th_Generation"
191179
case "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7" :
192-
return "iPad_Pro_11_3nd_Generation"
180+
return "iPad_Pro_11_3rd_Generation"
193181
case "iPad13,8", "iPad13,9", "iPad13,10", "iPad13,11" :
194182
return "iPad_Pro_12.9_5th_Generation"
195183

0 commit comments

Comments
 (0)