Skip to content

Commit 278beaa

Browse files
committed
Convert to Swift 4. Bump version to 0.4.2
1 parent 57aa660 commit 278beaa

File tree

8 files changed

+74
-67
lines changed

8 files changed

+74
-67
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[0.4.2](https://github.com/avito-tech/Marshroute/releases/tag/0.4.2)
2+
- Migrate to Swift 4
3+
14
[0.4.1](https://github.com/avito-tech/Marshroute/releases/tag/0.4.1)
25
- Fix 3d touch on iOS 11
36

Example/NavigationDemo.xcodeproj/project.pbxproj

+10-6
Original file line numberDiff line numberDiff line change
@@ -1521,11 +1521,12 @@
15211521
CC0B1D3F1CC20687006707B6 = {
15221522
CreatedOnToolsVersion = 7.3;
15231523
DevelopmentTeam = 5PHGGKL9UQ;
1524-
LastSwiftMigration = 0800;
1524+
LastSwiftMigration = 0900;
15251525
};
15261526
CC4267FA1F5FF76F00F4C407 = {
15271527
CreatedOnToolsVersion = 8.3.3;
15281528
DevelopmentTeam = 5PHGGKL9UQ;
1529+
LastSwiftMigration = 0900;
15291530
ProvisioningStyle = Automatic;
15301531
};
15311532
};
@@ -2027,8 +2028,8 @@
20272028
PRODUCT_BUNDLE_IDENTIFIER = ru.avito.navigation.demo;
20282029
PRODUCT_NAME = "$(TARGET_NAME)";
20292030
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
2030-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
2031-
SWIFT_VERSION = 3.0;
2031+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
2032+
SWIFT_VERSION = 4.0;
20322033
};
20332034
name = Debug;
20342035
};
@@ -2045,7 +2046,8 @@
20452046
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Onone";
20462047
PRODUCT_BUNDLE_IDENTIFIER = ru.avito.navigation.demo;
20472048
PRODUCT_NAME = "$(TARGET_NAME)";
2048-
SWIFT_VERSION = 3.0;
2049+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
2050+
SWIFT_VERSION = 4.0;
20492051
};
20502052
name = Release;
20512053
};
@@ -2062,7 +2064,8 @@
20622064
PRODUCT_BUNDLE_IDENTIFIER = ru.avito.MarshrouteTests;
20632065
PRODUCT_NAME = "$(TARGET_NAME)";
20642066
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
2065-
SWIFT_VERSION = 3.0;
2067+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
2068+
SWIFT_VERSION = 4.0;
20662069
};
20672070
name = Debug;
20682071
};
@@ -2078,7 +2081,8 @@
20782081
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
20792082
PRODUCT_BUNDLE_IDENTIFIER = ru.avito.MarshrouteTests;
20802083
PRODUCT_NAME = "$(TARGET_NAME)";
2081-
SWIFT_VERSION = 3.0;
2084+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
2085+
SWIFT_VERSION = 4.0;
20822086
};
20832087
name = Release;
20842088
};

Example/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- Marshroute (0.4.0)
2+
- Marshroute (0.4.2)
33

44
DEPENDENCIES:
55
- Marshroute (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
Marshroute: 4531776d941133bbb4509fb9e6d305769bd0726e
12+
Marshroute: a20a6e8227cff023b4499dee7699ee35fdd2e6b4
1313

1414
PODFILE CHECKSUM: 5dd4363cf78c4f640094889540569f4ca80712a0
1515

Example/Pods/Local Podspecs/Marshroute.podspec.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/project.pbxproj

+53-53
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Marshroute/Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Marshroute.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = 'Marshroute'
33
s.module_name = 'Marshroute'
4-
s.version = '0.4.1'
4+
s.version = '0.4.2'
55
s.summary = 'Marshroute by Timur Yusipov'
66
s.homepage = 'https://github.com/avito-tech/Marshroute'
77
s.license = 'MIT'

0 commit comments

Comments
 (0)