Skip to content

Commit cf99580

Browse files
CodaFiCodaFi
authored
Merge pull request #275 from CodaFi/touch-up
Update to Swift 4.2
2 parents 2567216 + 79b306c commit cf99580

File tree

10 files changed

+23
-456
lines changed

10 files changed

+23
-456
lines changed

‎.swift-version

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

‎.travis.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ matrix:
55
include:
66
- os: osx
77
language: objective-c
8-
osx_image: xcode9.3
8+
osx_image: xcode10
99
before_install:
1010
- git submodule update --init --recursive
1111
- pushd Utilities
1212
- ./compile.sh
1313
- popd
1414
script:
15-
- pod lib lint
15+
# FIXME: Re-enable when pods 1.6.0 is out of beta
16+
# - pod lib lint
1617
- carthage build --no-skip-current
1718
- os: osx
1819
language: objective-c
19-
osx_image: xcode9.3
20+
osx_image: xcode10
2021
before_install:
2122
- git submodule update --init --recursive
2223
- pushd Utilities
@@ -36,9 +37,9 @@ matrix:
3637
before_install:
3738
- git submodule update --init --recursive
3839
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
39-
- wget https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz
40-
- tar xzf swift-4.1-RELEASE-ubuntu14.04.tar.gz
41-
- export PATH=${PWD}/swift-4.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
40+
- wget https://swift.org/builds/swift-4.2-release/ubuntu1404/swift-4.2-RELEASE/swift-4.2-RELEASE-ubuntu14.04.tar.gz
41+
- tar xzf swift-4.2-RELEASE-ubuntu14.04.tar.gz
42+
- export PATH=${PWD}/swift-4.2-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
4243
- pushd Utilities
4344
- ./compile.sh
4445
- popd

‎Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "trill-lang/FileCheck" "0.0.4"
1+
github "trill-lang/FileCheck" "0.0.8"

‎Carthage/Checkouts/FileCheck

‎Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.1
1+
// swift-tools-version:4.2
22

33
import PackageDescription
44

‎Sources/SwiftCheck/Cartesian.swift

-410
Large diffs are not rendered by default.

‎Sources/SwiftCheck/Check.swift

-9
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,6 @@ public func <- (checker : ReportiveQuickCheck, test : @autoclosure @escaping ()
194194
_ = quickCheckWithResult(checker.args, test())
195195
}
196196

197-
/// Tests a property and prints the results to stdout.
198-
///
199-
/// - parameter prop: The property to be tested.
200-
/// - parameter name: The name of the property being tested.
201-
@available(*, deprecated, message: "Use quickCheck(asserting:) or quickCheck(reporting:) instead.")
202-
public func quickCheck(_ prop : Testable, name : String = "") {
203-
_ = quickCheckWithResult(CheckerArguments(name: name), prop)
204-
}
205-
206197
/// The interface for properties to be run through SwiftCheck with an XCTest
207198
/// assert. The property will still generate console output during testing.
208199
///

‎Sources/SwiftCheck/Gen.swift

-4
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,6 @@ extension Gen {
172172
}
173173
}
174174

175-
@available(*, deprecated, renamed: "zipWith")
176-
public static func map<A1, A2>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, transform: @escaping (A1, A2) -> A) -> Gen {
177-
return Gen.zipWith(ga1, ga2, transform: transform)
178-
}
179175
/// Returns a new generator that applies a given function to any outputs the
180176
/// given generators produce.
181177
public static func zipWith<A1, A2>(_ ga1 : Gen<A1>, _ ga2 : Gen<A2>, transform: @escaping (A1, A2) -> A) -> Gen {

‎SwiftCheck.xcodeproj/project.pbxproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@
847847
SWIFT_INSTALL_OBJC_HEADER = NO;
848848
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
849849
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
850-
SWIFT_VERSION = 4.0;
850+
SWIFT_VERSION = 4.2;
851851
TARGETED_DEVICE_FAMILY = 3;
852852
TVOS_DEPLOYMENT_TARGET = 9.0;
853853
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -880,7 +880,7 @@
880880
SKIP_INSTALL = YES;
881881
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
882882
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
883-
SWIFT_VERSION = 4.0;
883+
SWIFT_VERSION = 4.2;
884884
TARGETED_DEVICE_FAMILY = 3;
885885
TVOS_DEPLOYMENT_TARGET = 9.0;
886886
VALIDATE_PRODUCT = YES;
@@ -903,7 +903,7 @@
903903
SDKROOT = appletvos;
904904
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
905905
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
906-
SWIFT_VERSION = 4.0;
906+
SWIFT_VERSION = 4.2;
907907
TVOS_DEPLOYMENT_TARGET = 9.0;
908908
};
909909
name = Debug;
@@ -923,7 +923,7 @@
923923
SDKROOT = appletvos;
924924
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
925925
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
926-
SWIFT_VERSION = 4.0;
926+
SWIFT_VERSION = 4.2;
927927
TVOS_DEPLOYMENT_TARGET = 9.0;
928928
VALIDATE_PRODUCT = YES;
929929
};
@@ -1062,7 +1062,7 @@
10621062
SKIP_INSTALL = YES;
10631063
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10641064
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1065-
SWIFT_VERSION = 4.0;
1065+
SWIFT_VERSION = 4.2;
10661066
};
10671067
name = Debug;
10681068
};
@@ -1095,7 +1095,7 @@
10951095
SKIP_INSTALL = YES;
10961096
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
10971097
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1098-
SWIFT_VERSION = 4.0;
1098+
SWIFT_VERSION = 4.2;
10991099
};
11001100
name = Release;
11011101
};
@@ -1120,7 +1120,7 @@
11201120
PRODUCT_NAME = "$(TARGET_NAME)";
11211121
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
11221122
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1123-
SWIFT_VERSION = 4.0;
1123+
SWIFT_VERSION = 4.2;
11241124
};
11251125
name = Debug;
11261126
};
@@ -1142,7 +1142,7 @@
11421142
PRODUCT_NAME = "$(TARGET_NAME)";
11431143
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
11441144
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1145-
SWIFT_VERSION = 4.0;
1145+
SWIFT_VERSION = 4.2;
11461146
};
11471147
name = Release;
11481148
};
@@ -1178,7 +1178,7 @@
11781178
SWIFT_INSTALL_OBJC_HEADER = NO;
11791179
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
11801180
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1181-
SWIFT_VERSION = 4.0;
1181+
SWIFT_VERSION = 4.2;
11821182
TARGETED_DEVICE_FAMILY = "1,2,3";
11831183
TVOS_DEPLOYMENT_TARGET = 9.0;
11841184
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1212,7 +1212,7 @@
12121212
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
12131213
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12141214
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1215-
SWIFT_VERSION = 4.0;
1215+
SWIFT_VERSION = 4.2;
12161216
TARGETED_DEVICE_FAMILY = "1,2,3";
12171217
TVOS_DEPLOYMENT_TARGET = 9.0;
12181218
VALIDATE_PRODUCT = YES;
@@ -1243,7 +1243,7 @@
12431243
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
12441244
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
12451245
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1246-
SWIFT_VERSION = 4.0;
1246+
SWIFT_VERSION = 4.2;
12471247
};
12481248
name = Debug;
12491249
};
@@ -1266,7 +1266,7 @@
12661266
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
12671267
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12681268
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1269-
SWIFT_VERSION = 4.0;
1269+
SWIFT_VERSION = 4.2;
12701270
VALIDATE_PRODUCT = YES;
12711271
};
12721272
name = Release;

‎Templates/Cartesian.swift.gyb

-11
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,6 @@ zip_with_argument_list = ', '.join(['ga{0}'.format(n) for n in range(1, arity +
5151
}
5252
}
5353

54-
/// Returns a new generator that applies a given function to any outputs the
55-
/// given generators produce.
56-
///
57-
% for (t, p) in zip(types_list, ['ga{0}'.format(n) for n in range(1, arity + 1)]):
58-
/// - parameter ${p}: A generator of values of type `${t}`.
59-
% end
60-
@available(*, deprecated, renamed: "zipWith")
61-
public static func map<${type_parameter_list}>(${parameter_list}, transform : @escaping (${type_parameter_list}) -> A) -> Gen<A> {
62-
return Gen<A>.zipWith(${zip_with_argument_list}, transform: transform)
63-
}
64-
6554
/// Returns a new generator that applies a given function to any outputs the
6655
/// given generators produce.
6756
///

0 commit comments

Comments
 (0)