Skip to content

Commit b80713d

Browse files
CodaFiCodaFi
committed
Update to Swift 5
1 parent 7c1d3e4 commit b80713d

11 files changed

+62
-56
lines changed

‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1
1+
5.0

‎.travis.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ matrix:
55
include:
66
- os: osx
77
language: objective-c
8-
osx_image: xcode9.3
8+
osx_image: xcode10.2
99
before_install:
1010
- git submodule update --init --recursive
1111
script:
12-
# Restore pod build before shipping for 3.0
13-
# - pod lib lint
12+
- pod lib lint
1413
- carthage build --no-skip-current
1514
- os: osx
1615
language: objective-c
17-
osx_image: xcode9.3
16+
osx_image: xcode10.2
1817
before_install:
1918
- git submodule update --init --recursive
2019
script:
@@ -31,9 +30,9 @@ matrix:
3130
before_install:
3231
- git submodule update --init --recursive
3332
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
34-
- wget https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz
35-
- tar xzf swift-4.1-RELEASE-ubuntu14.04.tar.gz
36-
- export PATH=${PWD}/swift-4.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
33+
- wget https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz
34+
- tar xzf swift-5.0-RELEASE-ubuntu14.04.tar.gz
35+
- export PATH=${PWD}/swift-5.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
3736
script:
3837
- swift build
3938
notifications:

‎Cartfile.resolved

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
github "trill-lang/FileCheck" "0.0.4"
2-
github "typelift/Operadics" "0.3.0"
3-
github "typelift/SwiftCheck" "0.9.1"
1+
github "typelift/Operadics" "0.4.0"
2+
github "typelift/SwiftCheck" "0.12.0"

‎Carthage/Checkouts/Operadics

‎Carthage/Checkouts/SwiftCheck

Submodule SwiftCheck updated 23 files

‎Swiftx.xcodeproj/project.pbxproj

+46-38
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
/* Begin PBXBuildFile section */
1010
8240CD8B1C3A39D500EF4D29 /* Swiftx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8240CD811C3A39D500EF4D29 /* Swiftx.framework */; };
11-
8240CDCB1C3A3DCF00EF4D29 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8240CD9B1C3A39D600EF4D29 /* SwiftCheck.framework */; };
12-
82E51B941B5D4B9D003CA361 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E51B8B1B5D4B8B003CA361 /* SwiftCheck.framework */; };
11+
826F9C16224E493B00FA5106 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8240CD9B1C3A39D600EF4D29 /* SwiftCheck.framework */; };
12+
826F9C19224E499C00FA5106 /* Swiftx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DF76681B0BDE0A00C912B0 /* Swiftx.framework */; };
13+
826F9C1B224E49D300FA5106 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826F9C1A224E49D300FA5106 /* SwiftCheck.framework */; };
1314
82E51B961B5D4BA3003CA361 /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 82E51B8F1B5D4B8B003CA361 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1415
82E51B971B5D4BAC003CA361 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E51B8B1B5D4B8B003CA361 /* SwiftCheck.framework */; };
1516
82E51B981B5D4BAE003CA361 /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 82E51B8B1B5D4B8B003CA361 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -47,7 +48,6 @@
4748
841408BD1B1A89AD00BA2B6C /* Swiftx.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84DF76681B0BDE0A00C912B0 /* Swiftx.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4849
8480AB371A7B232A00C6162D /* Swiftx.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A88C891A70BD71003D53CF /* Swiftx.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4950
84A88C951A70BD71003D53CF /* Swiftx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A88C891A70BD71003D53CF /* Swiftx.framework */; };
50-
84DF76731B0BDE0A00C912B0 /* Swiftx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DF76681B0BDE0A00C912B0 /* Swiftx.framework */; };
5151
/* End PBXBuildFile section */
5252

5353
/* Begin PBXContainerItemProxy section */
@@ -79,6 +79,13 @@
7979
remoteGlobalIDString = 8240CCB01C3A123600EF4D29;
8080
remoteInfo = "SwiftCheck-tvOS";
8181
};
82+
826F9C17224E497900FA5106 /* PBXContainerItemProxy */ = {
83+
isa = PBXContainerItemProxy;
84+
containerPortal = 82E51B831B5D4B8B003CA361 /* SwiftCheck.xcodeproj */;
85+
proxyType = 1;
86+
remoteGlobalIDString = 84DF75F71B0BD54600C912B0;
87+
remoteInfo = "SwiftCheck-iOS";
88+
};
8289
82E51B8A1B5D4B8B003CA361 /* PBXContainerItemProxy */ = {
8390
isa = PBXContainerItemProxy;
8491
containerPortal = 82E51B831B5D4B8B003CA361 /* SwiftCheck.xcodeproj */;
@@ -107,13 +114,6 @@
107114
remoteGlobalIDString = 84DF76021B0BD54600C912B0;
108115
remoteInfo = "SwiftCheck-iOSTests";
109116
};
110-
82E51B921B5D4B99003CA361 /* PBXContainerItemProxy */ = {
111-
isa = PBXContainerItemProxy;
112-
containerPortal = 82E51B831B5D4B8B003CA361 /* SwiftCheck.xcodeproj */;
113-
proxyType = 1;
114-
remoteGlobalIDString = 84DF75F71B0BD54600C912B0;
115-
remoteInfo = "SwiftCheck-iOS";
116-
};
117117
82E51B9A1B5D4BB9003CA361 /* PBXContainerItemProxy */ = {
118118
isa = PBXContainerItemProxy;
119119
containerPortal = 82E51B831B5D4B8B003CA361 /* SwiftCheck.xcodeproj */;
@@ -166,6 +166,7 @@
166166
8240CD811C3A39D500EF4D29 /* Swiftx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Swiftx.framework; sourceTree = BUILT_PRODUCTS_DIR; };
167167
8240CD8A1C3A39D500EF4D29 /* Swiftx-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Swiftx-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
168168
8240CDA51C3A39F000EF4D29 /* Swiftx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Swiftx.framework; sourceTree = BUILT_PRODUCTS_DIR; };
169+
826F9C1A224E49D300FA5106 /* SwiftCheck.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCheck.framework; path = "../../Library/Developer/Xcode/DerivedData/Swiftx-gvghmkefilcrbjeddxunzrknagfa/Build/Products/Debug-iphoneos/SwiftCheck.framework"; sourceTree = "<group>"; };
169170
82E51B831B5D4B8B003CA361 /* SwiftCheck.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftCheck.xcodeproj; path = Carthage/Checkouts/SwiftCheck/SwiftCheck.xcodeproj; sourceTree = "<group>"; };
170171
82F2D2581F765545009C32CC /* Operators.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Operators.swift; path = Carthage/Checkouts/Operadics/Sources/Operadics/Operators.swift; sourceTree = SOURCE_ROOT; };
171172
82F2D2641F76561E009C32CC /* Combinators.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Combinators.swift; path = Sources/Swiftx/Combinators.swift; sourceTree = SOURCE_ROOT; };
@@ -195,7 +196,7 @@
195196
isa = PBXFrameworksBuildPhase;
196197
buildActionMask = 2147483647;
197198
files = (
198-
8240CDCB1C3A3DCF00EF4D29 /* SwiftCheck.framework in Frameworks */,
199+
826F9C16224E493B00FA5106 /* SwiftCheck.framework in Frameworks */,
199200
8240CD8B1C3A39D500EF4D29 /* Swiftx.framework in Frameworks */,
200201
);
201202
runOnlyForDeploymentPostprocessing = 0;
@@ -234,14 +235,22 @@
234235
isa = PBXFrameworksBuildPhase;
235236
buildActionMask = 2147483647;
236237
files = (
237-
82E51B941B5D4B9D003CA361 /* SwiftCheck.framework in Frameworks */,
238-
84DF76731B0BDE0A00C912B0 /* Swiftx.framework in Frameworks */,
238+
826F9C19224E499C00FA5106 /* Swiftx.framework in Frameworks */,
239+
826F9C1B224E49D300FA5106 /* SwiftCheck.framework in Frameworks */,
239240
);
240241
runOnlyForDeploymentPostprocessing = 0;
241242
};
242243
/* End PBXFrameworksBuildPhase section */
243244

244245
/* Begin PBXGroup section */
246+
826F9C15224E493B00FA5106 /* Frameworks */ = {
247+
isa = PBXGroup;
248+
children = (
249+
826F9C1A224E49D300FA5106 /* SwiftCheck.framework */,
250+
);
251+
name = Frameworks;
252+
sourceTree = "<group>";
253+
};
245254
82E51B841B5D4B8B003CA361 /* Products */ = {
246255
isa = PBXGroup;
247256
children = (
@@ -263,6 +272,7 @@
263272
84A88CE81A70BDB9003D53CF /* Swiftx */,
264273
84A88D2E1A70BF0A003D53CF /* SwiftxTests */,
265274
84A88C8A1A70BD71003D53CF /* Products */,
275+
826F9C15224E493B00FA5106 /* Frameworks */,
266276
);
267277
indentWidth = 4;
268278
sourceTree = "<group>";
@@ -499,7 +509,7 @@
499509
buildRules = (
500510
);
501511
dependencies = (
502-
82E51B931B5D4B99003CA361 /* PBXTargetDependency */,
512+
826F9C18224E497900FA5106 /* PBXTargetDependency */,
503513
84DF76751B0BDE0A00C912B0 /* PBXTargetDependency */,
504514
);
505515
name = "Swiftx-iOSTests";
@@ -514,7 +524,7 @@
514524
isa = PBXProject;
515525
attributes = {
516526
LastSwiftUpdateCheck = 0720;
517-
LastUpgradeCheck = 0930;
527+
LastUpgradeCheck = 1020;
518528
ORGANIZATIONNAME = TypeLift;
519529
TargetAttributes = {
520530
8240CD801C3A39D500EF4D29 = {
@@ -528,28 +538,30 @@
528538
};
529539
84A88C881A70BD71003D53CF = {
530540
CreatedOnToolsVersion = 6.2;
531-
LastSwiftMigration = 0800;
541+
LastSwiftMigration = 1020;
532542
};
533543
84A88C931A70BD71003D53CF = {
534544
CreatedOnToolsVersion = 6.2;
535-
LastSwiftMigration = 0800;
545+
LastSwiftMigration = 1020;
536546
};
537547
84DF76671B0BDE0A00C912B0 = {
538548
CreatedOnToolsVersion = 6.4;
539-
LastSwiftMigration = 0800;
549+
LastSwiftMigration = 1020;
540550
};
541551
84DF76711B0BDE0A00C912B0 = {
542552
CreatedOnToolsVersion = 6.4;
543-
LastSwiftMigration = 0800;
553+
DevelopmentTeam = D33M56YTC8;
554+
LastSwiftMigration = 1020;
544555
};
545556
};
546557
};
547558
buildConfigurationList = 84A88C831A70BD71003D53CF /* Build configuration list for PBXProject "Swiftx" */;
548559
compatibilityVersion = "Xcode 3.2";
549-
developmentRegion = English;
560+
developmentRegion = en;
550561
hasScannedForEncodings = 0;
551562
knownRegions = (
552563
en,
564+
Base,
553565
);
554566
mainGroup = 84A88C7F1A70BD71003D53CF;
555567
productRefGroup = 84A88C8A1A70BD71003D53CF /* Products */;
@@ -760,10 +772,10 @@
760772
name = "SwiftCheck-tvOS";
761773
targetProxy = 8240CDCE1C3A401500EF4D29 /* PBXContainerItemProxy */;
762774
};
763-
82E51B931B5D4B99003CA361 /* PBXTargetDependency */ = {
775+
826F9C18224E497900FA5106 /* PBXTargetDependency */ = {
764776
isa = PBXTargetDependency;
765777
name = "SwiftCheck-iOS";
766-
targetProxy = 82E51B921B5D4B99003CA361 /* PBXContainerItemProxy */;
778+
targetProxy = 826F9C17224E497900FA5106 /* PBXContainerItemProxy */;
767779
};
768780
82E51B9B1B5D4BB9003CA361 /* PBXTargetDependency */ = {
769781
isa = PBXTargetDependency;
@@ -930,6 +942,7 @@
930942
buildSettings = {
931943
ALWAYS_SEARCH_USER_PATHS = NO;
932944
APPLICATION_EXTENSION_API_ONLY = YES;
945+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
933946
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
934947
CLANG_CXX_LIBRARY = "libc++";
935948
CLANG_ENABLE_MODULES = YES;
@@ -987,6 +1000,7 @@
9871000
buildSettings = {
9881001
ALWAYS_SEARCH_USER_PATHS = NO;
9891002
APPLICATION_EXTENSION_API_ONLY = YES;
1003+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
9901004
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
9911005
CLANG_CXX_LIBRARY = "libc++";
9921006
CLANG_ENABLE_MODULES = YES;
@@ -1048,8 +1062,7 @@
10481062
PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.(PRODUCT_NAME:rfc1034identifier)";
10491063
PRODUCT_NAME = "$(TARGET_NAME)";
10501064
SKIP_INSTALL = YES;
1051-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1052-
SWIFT_VERSION = 4.0;
1065+
SWIFT_VERSION = 5.0;
10531066
};
10541067
name = Debug;
10551068
};
@@ -1069,8 +1082,7 @@
10691082
PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.(PRODUCT_NAME:rfc1034identifier)";
10701083
PRODUCT_NAME = "$(TARGET_NAME)";
10711084
SKIP_INSTALL = YES;
1072-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1073-
SWIFT_VERSION = 4.0;
1085+
SWIFT_VERSION = 5.0;
10741086
};
10751087
name = Release;
10761088
};
@@ -1091,8 +1103,7 @@
10911103
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
10921104
PRODUCT_BUNDLE_IDENTIFIER = "io.maxs.${PRODUCT_NAME:rfc1034identifier}";
10931105
PRODUCT_NAME = "$(TARGET_NAME)";
1094-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1095-
SWIFT_VERSION = 4.0;
1106+
SWIFT_VERSION = 5.0;
10961107
};
10971108
name = Debug;
10981109
};
@@ -1109,8 +1120,7 @@
11091120
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
11101121
PRODUCT_BUNDLE_IDENTIFIER = "io.maxs.${PRODUCT_NAME:rfc1034identifier}";
11111122
PRODUCT_NAME = "$(TARGET_NAME)";
1112-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1113-
SWIFT_VERSION = 4.0;
1123+
SWIFT_VERSION = 5.0;
11141124
};
11151125
name = Release;
11161126
};
@@ -1137,8 +1147,7 @@
11371147
PRODUCT_NAME = Swiftx;
11381148
SDKROOT = iphoneos;
11391149
SKIP_INSTALL = YES;
1140-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1141-
SWIFT_VERSION = 4.0;
1150+
SWIFT_VERSION = 5.0;
11421151
TARGETED_DEVICE_FAMILY = "1,2";
11431152
};
11441153
name = Debug;
@@ -1161,8 +1170,7 @@
11611170
PRODUCT_NAME = Swiftx;
11621171
SDKROOT = iphoneos;
11631172
SKIP_INSTALL = YES;
1164-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1165-
SWIFT_VERSION = 4.0;
1173+
SWIFT_VERSION = 5.0;
11661174
TARGETED_DEVICE_FAMILY = "1,2";
11671175
VALIDATE_PRODUCT = YES;
11681176
};
@@ -1174,6 +1182,7 @@
11741182
APPLICATION_EXTENSION_API_ONLY = NO;
11751183
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
11761184
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1185+
DEVELOPMENT_TEAM = D33M56YTC8;
11771186
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
11781187
GCC_NO_COMMON_BLOCKS = YES;
11791188
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1186,8 +1195,7 @@
11861195
PRODUCT_BUNDLE_IDENTIFIER = "io.maxs.${PRODUCT_NAME:rfc1034identifier}";
11871196
PRODUCT_NAME = "$(TARGET_NAME)";
11881197
SDKROOT = iphoneos;
1189-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1190-
SWIFT_VERSION = 4.0;
1198+
SWIFT_VERSION = 5.0;
11911199
};
11921200
name = Debug;
11931201
};
@@ -1196,6 +1204,7 @@
11961204
buildSettings = {
11971205
APPLICATION_EXTENSION_API_ONLY = NO;
11981206
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1207+
DEVELOPMENT_TEAM = D33M56YTC8;
11991208
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
12001209
GCC_NO_COMMON_BLOCKS = YES;
12011210
INFOPLIST_FILE = Tests/Info.plist;
@@ -1204,8 +1213,7 @@
12041213
PRODUCT_BUNDLE_IDENTIFIER = "io.maxs.${PRODUCT_NAME:rfc1034identifier}";
12051214
PRODUCT_NAME = "$(TARGET_NAME)";
12061215
SDKROOT = iphoneos;
1207-
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1208-
SWIFT_VERSION = 4.0;
1216+
SWIFT_VERSION = 5.0;
12091217
VALIDATE_PRODUCT = YES;
12101218
};
12111219
name = Release;

‎Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-tvOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-watchOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Swiftx.xcodeproj/xcshareddata/xcschemes/SwiftxTests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)