diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb6578f..1032574 100644
--- 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
index 019f92a..86f87dc 100644
--- 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
index ee76ce7..2552387 100644
--- 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
index 7437598..c7657a3 100644
--- a/Example/Pods/Local Podspecs/Marshroute.podspec.json
+++ b/Example/Pods/Local Podspecs/Marshroute.podspec.json
@@ -1,7 +1,7 @@
{
"name": "Marshroute",
"module_name": "Marshroute",
- "version": "0.4.0",
+ "version": "0.4.2",
"summary": "Marshroute by Timur Yusipov",
"homepage": "https://github.com/avito-tech/Marshroute",
"license": "MIT",
@@ -10,7 +10,7 @@
},
"source": {
"git": "https://github.com/avito-tech/Marshroute.git",
- "tag": "0.4.0"
+ "tag": "0.4.2"
},
"platforms": {
"ios": "8.0"
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
index ee76ce7..2552387 100644
--- a/Example/Pods/Manifest.lock
+++ b/Example/Pods/Manifest.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/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
index b7a8866..0fa53d5 100644
--- a/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -1653,6 +1653,40 @@
};
name = Debug;
};
+ 324BFB99CCCC07BB347E3E1C5570462C /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1B1684558885F98573E2E425D3A17D2F /* Marshroute.xcconfig */;
+ buildSettings = {
+ CODE_SIGN_IDENTITY = "";
+ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+ "CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+ CURRENT_PROJECT_VERSION = 1;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEFINES_MODULE = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ DYLIB_INSTALL_NAME_BASE = "@rpath";
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PREFIX_HEADER = "Target Support Files/Marshroute/Marshroute-prefix.pch";
+ INFOPLIST_FILE = "Target Support Files/Marshroute/Info.plist";
+ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ MODULEMAP_FILE = "Target Support Files/Marshroute/Marshroute.modulemap";
+ MTL_ENABLE_DEBUG_INFO = NO;
+ PRODUCT_NAME = Marshroute;
+ SDKROOT = iphoneos;
+ SKIP_INSTALL = YES;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ VERSIONING_SYSTEM = "apple-generic";
+ VERSION_INFO_PREFIX = "";
+ };
+ name = Release;
+ };
34FE9531DA9AF2820790339988D5FF41 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -1697,9 +1731,9 @@
};
name = Release;
};
- 8E1E65F5B437253AB4E0A4C1884CB512 /* Debug */ = {
+ 3AAAF7E75EDF30B96B2F4D606D3BB284 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = FDEC05797E200BFA720413034EF44F1C /* Pods-NavigationDemo.debug.xcconfig */;
+ baseConfigurationReference = 1B1684558885F98573E2E425D3A17D2F /* Marshroute.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1713,33 +1747,29 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
- INFOPLIST_FILE = "Target Support Files/Pods-NavigationDemo/Info.plist";
+ GCC_PREFIX_HEADER = "Target Support Files/Marshroute/Marshroute-prefix.pch";
+ INFOPLIST_FILE = "Target Support Files/Marshroute/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MACH_O_TYPE = staticlib;
- MODULEMAP_FILE = "Target Support Files/Pods-NavigationDemo/Pods-NavigationDemo.modulemap";
+ MODULEMAP_FILE = "Target Support Files/Marshroute/Marshroute.modulemap";
MTL_ENABLE_DEBUG_INFO = YES;
- OTHER_LDFLAGS = "";
- OTHER_LIBTOOLFLAGS = "";
OTHER_SWIFT_FLAGS = "$(inherited) -D DEBUG -Onone";
- PODS_ROOT = "$(SRCROOT)";
- PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
- PRODUCT_NAME = Pods_NavigationDemo;
+ PRODUCT_NAME = Marshroute;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
- A668B47694E5D3C5E1DB1223BF039FD9 /* Debug */ = {
+ 8E1E65F5B437253AB4E0A4C1884CB512 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 1B1684558885F98573E2E425D3A17D2F /* Marshroute.xcconfig */;
+ baseConfigurationReference = FDEC05797E200BFA720413034EF44F1C /* Pods-NavigationDemo.debug.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1753,15 +1783,19 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREFIX_HEADER = "Target Support Files/Marshroute/Marshroute-prefix.pch";
- INFOPLIST_FILE = "Target Support Files/Marshroute/Info.plist";
+ INFOPLIST_FILE = "Target Support Files/Pods-NavigationDemo/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MODULEMAP_FILE = "Target Support Files/Marshroute/Marshroute.modulemap";
+ MACH_O_TYPE = staticlib;
+ MODULEMAP_FILE = "Target Support Files/Pods-NavigationDemo/Pods-NavigationDemo.modulemap";
MTL_ENABLE_DEBUG_INFO = YES;
+ OTHER_LDFLAGS = "";
+ OTHER_LIBTOOLFLAGS = "";
OTHER_SWIFT_FLAGS = "$(inherited) -D DEBUG -Onone";
- PRODUCT_NAME = Marshroute;
+ PODS_ROOT = "$(SRCROOT)";
+ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+ PRODUCT_NAME = Pods_NavigationDemo;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -1821,40 +1855,6 @@
};
name = Debug;
};
- E5DF22AA4ADC2AE14B9F61A369FE6BBB /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1B1684558885F98573E2E425D3A17D2F /* Marshroute.xcconfig */;
- buildSettings = {
- CODE_SIGN_IDENTITY = "";
- "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
- "CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
- CURRENT_PROJECT_VERSION = 1;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- DEFINES_MODULE = YES;
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
- DYLIB_INSTALL_NAME_BASE = "@rpath";
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREFIX_HEADER = "Target Support Files/Marshroute/Marshroute-prefix.pch";
- INFOPLIST_FILE = "Target Support Files/Marshroute/Info.plist";
- INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MODULEMAP_FILE = "Target Support Files/Marshroute/Marshroute.modulemap";
- MTL_ENABLE_DEBUG_INFO = NO;
- PRODUCT_NAME = Marshroute;
- SDKROOT = iphoneos;
- SKIP_INSTALL = YES;
- SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_VERSION = 3.0;
- TARGETED_DEVICE_FAMILY = "1,2";
- VERSIONING_SYSTEM = "apple-generic";
- VERSION_INFO_PREFIX = "";
- };
- name = Release;
- };
FA15713C1909CD89B00ACB135D0DDE69 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8509705C9A290AB3423B2B59C45DA0A2 /* Pods-MarshrouteTests.release.xcconfig */;
@@ -1899,8 +1899,8 @@
08D7B1EFADAC845B0A7ACCD6F31CC0B1 /* Build configuration list for PBXNativeTarget "Marshroute" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- A668B47694E5D3C5E1DB1223BF039FD9 /* Debug */,
- E5DF22AA4ADC2AE14B9F61A369FE6BBB /* Release */,
+ 3AAAF7E75EDF30B96B2F4D606D3BB284 /* Debug */,
+ 324BFB99CCCC07BB347E3E1C5570462C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
diff --git a/Example/Pods/Target Support Files/Marshroute/Info.plist b/Example/Pods/Target Support Files/Marshroute/Info.plist
index 53e4061..a71f7a0 100644
--- a/Example/Pods/Target Support Files/Marshroute/Info.plist
+++ b/Example/Pods/Target Support Files/Marshroute/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 0.4.0
+ 0.4.2
CFBundleSignature
????
CFBundleVersion
diff --git a/Marshroute.podspec b/Marshroute.podspec
index 8700973..d3056da 100644
--- 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'