Merge pull request #6 from sgr-ksmt/swift5

Support Swift 5.0.
sgr-ksmt · Mar 31, 2019 · 63e6fd1 · 63e6fd1
2 parents 21effc5 + 2403879
commit 63e6fd1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -131,6 +131,7 @@
 				TargetAttributes = {
 					162860D31FAA4851003D85A6 = {
 						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -361,7 +362,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = demo.lobster;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -376,7 +377,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = demo.lobster;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Demo/Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift
@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         FirebaseApp.configure()
         return true
     }

diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
@@ -92,7 +92,7 @@ SPEC CHECKSUMS:
   FirebaseRemoteConfig: 7b6d675dfb11f0e0e638caee00908b06af150d56
   GoogleAppMeasurement: fc4a4c3fe0144db9313cbf443ffe62e6b1d6268c
   GoogleUtilities: 6f681e27050c5e130325e89fa0316dfca826f954
-  Lobster: ded664b60ea4a6c5736a76dfdb8190ded8fae2aa
+  Lobster: fd1c1322233a5de3a9c2aa33124e65d37e04d657
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
   Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5
 

diff --git a/Lobster.podspec b/Lobster.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Lobster"
-  s.version          = "2.0"
+  s.version          = "2.1"
   s.summary          = "Type-safe Firebase-RemoteConfig helper library"
   s.homepage         = "https://github.com/sgr-ksmt/Lobster"
   s.license          = 'MIT'
@@ -10,6 +10,6 @@ Pod::Spec.new do |s|
   s.requires_arc     = true
   s.source_files     = "Sources/**/*"
   s.static_framework = true
-  s.swift_version    = '4.2'
+  s.swift_version    = '5.0'
   s.dependency "Firebase/RemoteConfig", "~> 5.0"
 end
diff --git a/Lobster.xcodeproj/project.pbxproj b/Lobster.xcodeproj/project.pbxproj
@@ -237,11 +237,12 @@
 				TargetAttributes = {
 					163143FE1FA8BE8600D25996 = {
 						CreatedOnToolsVersion = 9.0;
-						LastSwiftMigration = "";
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					16FCE993223CE14A00F6D643 = {
 						CreatedOnToolsVersion = 10.1;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -499,7 +500,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -521,7 +522,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "-.Lobster";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -539,7 +540,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "-.test.LobsterTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -556,7 +557,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "-.test.LobsterTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Type-safe Firebase-RemoteConfig helper library
 
 
 [![GitHub release](https://img.shields.io/github/release/sgr-ksmt/Lobster.svg)](https://github.com/sgr-ksmt/Lobster/releases)
-![Language](https://img.shields.io/badge/language-Swift%204.1-orange.svg)
+![Language](https://img.shields.io/badge/language-Swift%205.0-orange.svg)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods](https://img.shields.io/badge/Cocoa%20Pods-✓-4BC51D.svg?style=flat)](https://cocoapods.org/pods/Lobster)
 [![CocoaPodsDL](https://img.shields.io/cocoapods/dt/Lobster.svg)](https://cocoapods.org/pods/Lobster)
@@ -302,7 +302,7 @@ $ open Demo.xcworkspace
 it, simply add the following line to your Podfile:
 
 ```ruby
-pod 'Lobster', '~> 2.0'
+pod 'Lobster', '~> 2.1'
 ```
 
 and run `pod install`