Convert to Swift 4. Bump version to 0.4.2

avito-tech · Sep 29, 2017 · 278beaa · 278beaa
1 parent 57aa660
commit 278beaa
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+[0.4.2](https://github.com/avito-tech/Marshroute/releases/tag/0.4.2)
+- Migrate to Swift 4
+
 [0.4.1](https://github.com/avito-tech/Marshroute/releases/tag/0.4.1)
 - Fix 3d touch on iOS 11
 

diff --git a/Example/NavigationDemo.xcodeproj/project.pbxproj b/Example/NavigationDemo.xcodeproj/project.pbxproj
@@ -1521,11 +1521,12 @@
 					CC0B1D3F1CC20687006707B6 = {
 						CreatedOnToolsVersion = 7.3;
 						DevelopmentTeam = 5PHGGKL9UQ;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					CC4267FA1F5FF76F00F4C407 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 5PHGGKL9UQ;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -2027,8 +2028,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.navigation.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -2045,7 +2046,8 @@
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Onone";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.navigation.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -2062,7 +2064,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.MarshrouteTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -2078,7 +2081,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.MarshrouteTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - Marshroute (0.4.0)
+  - Marshroute (0.4.2)
 
 DEPENDENCIES:
   - Marshroute (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Marshroute: 4531776d941133bbb4509fb9e6d305769bd0726e
+  Marshroute: a20a6e8227cff023b4499dee7699ee35fdd2e6b4
 
 PODFILE CHECKSUM: 5dd4363cf78c4f640094889540569f4ca80712a0
 

diff --git a/Example/Pods/Local Podspecs/Marshroute.podspec.json b/Example/Pods/Local Podspecs/Marshroute.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/Marshroute/Info.plist b/Example/Pods/Target Support Files/Marshroute/Info.plist
diff --git a/Marshroute.podspec b/Marshroute.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                   = 'Marshroute'
   s.module_name            = 'Marshroute'
-  s.version                = '0.4.1'
+  s.version                = '0.4.2'
   s.summary                = 'Marshroute by Timur Yusipov'
   s.homepage               = 'https://github.com/avito-tech/Marshroute'
   s.license                = 'MIT'