Skip to content

Commit 2819320

Browse files
committed
Upgrade to XCode 10 and Swift 4.2
1 parent 1b33e44 commit 2819320

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

Example/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1515
var window: UIWindow?
1616

1717

18-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
18+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1919

2020
//Variant 1: ServiceLocator setup as singleton
2121
print("Begin setup ServiceLocator")

ServiceContainerKit.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ServiceContainerKit"
3-
s.version = "1.0.0"
3+
s.version = "1.0.1"
44
s.summary = "Kit to create your own IoC Container or ServiceLocator. Use ServiceProvider as core, ServiceLocator as ready IoC Container"
55
s.description = <<-DESC
66
Written in Swift.
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
1515
s.author = { "ViR (Vitaliy Korotkiy)" => "[email protected]" }
1616
s.source = { :git => "https://github.com/ProVir/ServiceContainerKit.git", :tag => "#{s.version}" }
1717

18-
s.swift_version = '4'
18+
s.swift_version = '4.2'
1919

2020
s.ios.deployment_target = '8.0'
2121
s.osx.deployment_target = '10.10'

ServiceContainerKit.xcodeproj/project.pbxproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,16 @@
321321
TargetAttributes = {
322322
506F9EFE20E3E3F100E44CBD = {
323323
CreatedOnToolsVersion = 9.4.1;
324+
LastSwiftMigration = 1000;
324325
TestTargetID = 50DA15C920C44AF700B756B3;
325326
};
326327
506F9F1E20E3E4B400E44CBD = {
327328
CreatedOnToolsVersion = 9.4.1;
329+
LastSwiftMigration = 1000;
328330
};
329331
50DA15C920C44AF700B756B3 = {
330332
CreatedOnToolsVersion = 9.4;
331-
LastSwiftMigration = 0940;
333+
LastSwiftMigration = 1000;
332334
};
333335
};
334336
};
@@ -472,7 +474,7 @@
472474
PRODUCT_BUNDLE_IDENTIFIER = ru.provir.ServiceContainerKitTests;
473475
PRODUCT_NAME = "$(TARGET_NAME)";
474476
PROVISIONING_PROFILE_SPECIFIER = "";
475-
SWIFT_VERSION = 4.0;
477+
SWIFT_VERSION = 4.2;
476478
TARGETED_DEVICE_FAMILY = "1,2";
477479
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
478480
};
@@ -495,7 +497,7 @@
495497
PRODUCT_BUNDLE_IDENTIFIER = ru.provir.ServiceContainerKitTests;
496498
PRODUCT_NAME = "$(TARGET_NAME)";
497499
PROVISIONING_PROFILE_SPECIFIER = "";
498-
SWIFT_VERSION = 4.0;
500+
SWIFT_VERSION = 4.2;
499501
TARGETED_DEVICE_FAMILY = "1,2";
500502
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
501503
};
@@ -523,7 +525,7 @@
523525
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
524526
PROVISIONING_PROFILE_SPECIFIER = "";
525527
SKIP_INSTALL = YES;
526-
SWIFT_VERSION = 4.0;
528+
SWIFT_VERSION = 4.2;
527529
TARGETED_DEVICE_FAMILY = "1,2";
528530
VERSIONING_SYSTEM = "apple-generic";
529531
VERSION_INFO_PREFIX = "";
@@ -552,7 +554,7 @@
552554
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
553555
PROVISIONING_PROFILE_SPECIFIER = "";
554556
SKIP_INSTALL = YES;
555-
SWIFT_VERSION = 4.0;
557+
SWIFT_VERSION = 4.2;
556558
TARGETED_DEVICE_FAMILY = "1,2";
557559
VERSIONING_SYSTEM = "apple-generic";
558560
VERSION_INFO_PREFIX = "";
@@ -693,7 +695,7 @@
693695
PROVISIONING_PROFILE_SPECIFIER = "";
694696
SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Bridging-Header.h";
695697
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
696-
SWIFT_VERSION = 4.0;
698+
SWIFT_VERSION = 4.2;
697699
TARGETED_DEVICE_FAMILY = "1,2";
698700
};
699701
name = Debug;
@@ -716,7 +718,7 @@
716718
PRODUCT_NAME = "$(TARGET_NAME)";
717719
PROVISIONING_PROFILE_SPECIFIER = "";
718720
SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Bridging-Header.h";
719-
SWIFT_VERSION = 4.0;
721+
SWIFT_VERSION = 4.2;
720722
TARGETED_DEVICE_FAMILY = "1,2";
721723
};
722724
name = Release;

0 commit comments

Comments
 (0)