Skip to content

Commit 4f540cb

Browse files
committed
feat: migrate to Swift 4
1 parent 569d611 commit 4f540cb

2 files changed

Lines changed: 30 additions & 8 deletions

File tree

Demo.xcodeproj/project.pbxproj

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,16 +264,17 @@
264264
TargetAttributes = {
265265
8D27973F1D77E74B00BBAC45 = {
266266
CreatedOnToolsVersion = 7.3;
267-
LastSwiftMigration = 0800;
267+
LastSwiftMigration = 0940;
268268
};
269269
8D654C2D1F2C2D56005019EF = {
270270
CreatedOnToolsVersion = 8.3.3;
271+
LastSwiftMigration = 0940;
271272
ProvisioningStyle = Automatic;
272273
TestTargetID = 8DB921351D76A0C2006961FE;
273274
};
274275
8DB921351D76A0C2006961FE = {
275276
CreatedOnToolsVersion = 7.3;
276-
LastSwiftMigration = 0800;
277+
LastSwiftMigration = 0940;
277278
};
278279
};
279280
};
@@ -457,7 +458,8 @@
457458
PRODUCT_BUNDLE_IDENTIFIER = im.muyexi.StaticTableViewController;
458459
PRODUCT_NAME = "$(TARGET_NAME)";
459460
SKIP_INSTALL = YES;
460-
SWIFT_VERSION = 3.0;
461+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
462+
SWIFT_VERSION = 4.0;
461463
TARGETED_DEVICE_FAMILY = "1,2";
462464
VERSIONING_SYSTEM = "apple-generic";
463465
VERSION_INFO_PREFIX = "";
@@ -479,7 +481,8 @@
479481
PRODUCT_BUNDLE_IDENTIFIER = im.muyexi.StaticTableViewController;
480482
PRODUCT_NAME = "$(TARGET_NAME)";
481483
SKIP_INSTALL = YES;
482-
SWIFT_VERSION = 3.0;
484+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
485+
SWIFT_VERSION = 4.0;
483486
TARGETED_DEVICE_FAMILY = "1,2";
484487
VERSIONING_SYSTEM = "apple-generic";
485488
VERSION_INFO_PREFIX = "";
@@ -498,7 +501,8 @@
498501
PRODUCT_BUNDLE_IDENTIFIER = im.muyexi.DemoTests;
499502
PRODUCT_NAME = "$(TARGET_NAME)";
500503
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
501-
SWIFT_VERSION = 3.0;
504+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
505+
SWIFT_VERSION = 4.0;
502506
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
503507
};
504508
name = Debug;
@@ -514,7 +518,8 @@
514518
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
515519
PRODUCT_BUNDLE_IDENTIFIER = im.muyexi.DemoTests;
516520
PRODUCT_NAME = "$(TARGET_NAME)";
517-
SWIFT_VERSION = 3.0;
521+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
522+
SWIFT_VERSION = 4.0;
518523
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
519524
};
520525
name = Release;
@@ -619,7 +624,8 @@
619624
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
620625
PRODUCT_BUNDLE_IDENTIFIER = im.muyexi.Demo;
621626
PRODUCT_NAME = Demo;
622-
SWIFT_VERSION = 3.0;
627+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
628+
SWIFT_VERSION = 4.0;
623629
};
624630
name = Debug;
625631
};
@@ -633,7 +639,8 @@
633639
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
634640
PRODUCT_BUNDLE_IDENTIFIER = im.muyexi.Demo;
635641
PRODUCT_NAME = Demo;
636-
SWIFT_VERSION = 3.0;
642+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
643+
SWIFT_VERSION = 4.0;
637644
};
638645
name = Release;
639646
};

Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",
@@ -29,6 +39,11 @@
2939
"idiom" : "iphone",
3040
"size" : "60x60",
3141
"scale" : "3x"
42+
},
43+
{
44+
"idiom" : "ios-marketing",
45+
"size" : "1024x1024",
46+
"scale" : "1x"
3247
}
3348
],
3449
"info" : {

0 commit comments

Comments
 (0)