Skip to content

Commit e9e7ce8

Browse files
Merge pull request #9 from studyplus/build_xcode10
build by xcode10
2 parents ff06584 + bb606df commit e9e7ce8

File tree

2 files changed

+14
-22
lines changed

2 files changed

+14
-22
lines changed

Demo/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3232

3333
var window: UIWindow?
3434

35-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
35+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
3636
return true
3737
}
3838

@@ -60,7 +60,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
6060

6161
// MARK: - iOS9 or above
6262

63-
func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
63+
func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
6464
print("-- called application(_:open:options:) --")
6565
return Studyplus.shared.handle(appDelegateUrl: url)
6666
}

StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -322,22 +322,22 @@
322322
TargetAttributes = {
323323
183FDA661E7510920085589F = {
324324
CreatedOnToolsVersion = 8.2.1;
325-
LastSwiftMigration = 0900;
325+
LastSwiftMigration = 1000;
326326
ProvisioningStyle = Automatic;
327327
};
328328
183FDA6F1E7510920085589F = {
329329
CreatedOnToolsVersion = 8.2.1;
330-
LastSwiftMigration = 0900;
330+
LastSwiftMigration = 1000;
331331
ProvisioningStyle = Automatic;
332332
};
333333
183FDA841E7510F00085589F = {
334334
CreatedOnToolsVersion = 8.2.1;
335-
LastSwiftMigration = 0900;
335+
LastSwiftMigration = 1000;
336336
ProvisioningStyle = Automatic;
337337
};
338338
183FDA971E7510F10085589F = {
339339
CreatedOnToolsVersion = 8.2.1;
340-
LastSwiftMigration = 0900;
340+
LastSwiftMigration = 1000;
341341
ProvisioningStyle = Automatic;
342342
TestTargetID = 183FDA841E7510F00085589F;
343343
};
@@ -658,8 +658,7 @@
658658
PRODUCT_NAME = "$(TARGET_NAME)";
659659
SKIP_INSTALL = YES;
660660
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
661-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
662-
SWIFT_VERSION = 4.0;
661+
SWIFT_VERSION = 4.2;
663662
};
664663
name = Debug;
665664
};
@@ -684,8 +683,7 @@
684683
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
685684
PRODUCT_NAME = "$(TARGET_NAME)";
686685
SKIP_INSTALL = YES;
687-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
688-
SWIFT_VERSION = 4.0;
686+
SWIFT_VERSION = 4.2;
689687
};
690688
name = Release;
691689
};
@@ -697,8 +695,7 @@
697695
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
698696
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
699697
PRODUCT_NAME = "$(TARGET_NAME)";
700-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
701-
SWIFT_VERSION = 4.0;
698+
SWIFT_VERSION = 4.2;
702699
};
703700
name = Debug;
704701
};
@@ -710,8 +707,7 @@
710707
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
711708
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
712709
PRODUCT_NAME = "$(TARGET_NAME)";
713-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
714-
SWIFT_VERSION = 4.0;
710+
SWIFT_VERSION = 4.2;
715711
};
716712
name = Release;
717713
};
@@ -728,8 +724,7 @@
728724
OTHER_SWIFT_FLAGS = "$(inherited)";
729725
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
730726
PRODUCT_NAME = "$(TARGET_NAME)";
731-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
732-
SWIFT_VERSION = 4.0;
727+
SWIFT_VERSION = 4.2;
733728
};
734729
name = Debug;
735730
};
@@ -746,8 +741,7 @@
746741
OTHER_SWIFT_FLAGS = "$(inherited)";
747742
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
748743
PRODUCT_NAME = "$(TARGET_NAME)";
749-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
750-
SWIFT_VERSION = 4.0;
744+
SWIFT_VERSION = 4.2;
751745
};
752746
name = Release;
753747
};
@@ -761,8 +755,7 @@
761755
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
762756
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
763757
PRODUCT_NAME = "$(TARGET_NAME)";
764-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
765-
SWIFT_VERSION = 4.0;
758+
SWIFT_VERSION = 4.2;
766759
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
767760
};
768761
name = Debug;
@@ -777,8 +770,7 @@
777770
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
778771
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
779772
PRODUCT_NAME = "$(TARGET_NAME)";
780-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
781-
SWIFT_VERSION = 4.0;
773+
SWIFT_VERSION = 4.2;
782774
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
783775
};
784776
name = Release;

0 commit comments

Comments
 (0)