Skip to content

Commit 3d651bb

Browse files
lucdionlucdion
authored
Merge pull request #202 from layoutBox/update_travis_to_xcode_10_3
Update travis to xcode 11
2 parents 2ecffc1 + e4f4ae4 commit 3d651bb

File tree

23 files changed

+328
-290
lines changed

23 files changed

+328
-290
lines changed

‎.swift-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10.1
2+
osx_image: xcode11
33

44
cache:
55
- bundler

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
2-
gem 'cocoapods', '~> 1.6.0.beta.2'
2+
gem 'cocoapods', '~> 1.7'
33
gem 'jazzy', '0.9'
44
gem 'xcpretty-travis-formatter'

‎Gemfile.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ GEM
99
tzinfo (~> 1.1)
1010
atomos (0.1.3)
1111
claide (1.0.3)
12-
cocoapods (1.6.2)
12+
cocoapods (1.7.5)
1313
activesupport (>= 4.0.2, < 5)
1414
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.6.2)
16-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.7.5)
16+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
1717
cocoapods-downloader (>= 1.2.2, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
1919
cocoapods-search (>= 1.0.0, < 2.0)
@@ -22,13 +22,13 @@ GEM
2222
cocoapods-try (>= 1.1.0, < 2.0)
2323
colored2 (~> 3.1)
2424
escape (~> 0.0.4)
25-
fourflusher (>= 2.2.0, < 3.0)
25+
fourflusher (>= 2.3.0, < 3.0)
2626
gh_inspector (~> 1.0)
2727
molinillo (~> 0.6.6)
2828
nap (~> 1.0)
2929
ruby-macho (~> 1.4)
30-
xcodeproj (>= 1.8.1, < 2.0)
31-
cocoapods-core (1.6.2)
30+
xcodeproj (>= 1.10.0, < 2.0)
31+
cocoapods-core (1.7.5)
3232
activesupport (>= 4.0.2, < 6)
3333
fuzzy_match (~> 2.0.4)
3434
nap (~> 1.0)
@@ -100,7 +100,7 @@ PLATFORMS
100100
ruby
101101

102102
DEPENDENCIES
103-
cocoapods (~> 1.6.0.beta.2)
103+
cocoapods (~> 1.7)
104104
jazzy (= 0.9)
105105
xcpretty-travis-formatter
106106

‎PinLayout.podspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
Pod::Spec.new do |spec|
1010
spec.name = "PinLayout"
1111
spec.version = "1.8.9"
12-
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
12+
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
1313
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
1414
spec.homepage = "https://github.com/layoutBox/PinLayout"
1515
spec.license = "MIT license"
1616
spec.author = { "Luc Dion" => "[email protected]" }
1717
spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
1818
spec.source_files = "Sources/**/*.swift"
19+
spec.swift_version = '4.2'
1920

2021
spec.ios.deployment_target = '8.0'
2122
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'

‎PinLayout.xcodeproj/project.pbxproj‎

Lines changed: 96 additions & 83 deletions
Large diffs are not rendered by default.

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ SPEC CHECKSUMS:
2828

2929
PODFILE CHECKSUM: 9b1d14a0f41ae1e8ebc931fa3d033da6c545223e
3030

31-
COCOAPODS: 1.6.2
31+
COCOAPODS: 1.7.1

‎TestProjects/carthage/ios/PinLayout-Carthage-iOS.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
isa = PBXProject;
125125
attributes = {
126126
LastSwiftUpdateCheck = 0830;
127-
LastUpgradeCheck = 0830;
127+
LastUpgradeCheck = 1100;
128128
ORGANIZATIONNAME = Layoutbox;
129129
TargetAttributes = {
130130
24C872FA1EE2D113007BFE47 = {
@@ -136,7 +136,7 @@
136136
};
137137
buildConfigurationList = 24C872F61EE2D113007BFE47 /* Build configuration list for PBXProject "PinLayout-Carthage-iOS" */;
138138
compatibilityVersion = "Xcode 3.2";
139-
developmentRegion = English;
139+
developmentRegion = en;
140140
hasScannedForEncodings = 0;
141141
knownRegions = (
142142
en,
@@ -202,21 +202,30 @@
202202
isa = XCBuildConfiguration;
203203
buildSettings = {
204204
ALWAYS_SEARCH_USER_PATHS = NO;
205+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
205206
CLANG_ANALYZER_NONNULL = YES;
206207
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
207208
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
208209
CLANG_CXX_LIBRARY = "libc++";
209210
CLANG_ENABLE_MODULES = YES;
210211
CLANG_ENABLE_OBJC_ARC = YES;
212+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
211213
CLANG_WARN_BOOL_CONVERSION = YES;
214+
CLANG_WARN_COMMA = YES;
212215
CLANG_WARN_CONSTANT_CONVERSION = YES;
216+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
213217
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
214218
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
215219
CLANG_WARN_EMPTY_BODY = YES;
216220
CLANG_WARN_ENUM_CONVERSION = YES;
217221
CLANG_WARN_INFINITE_RECURSION = YES;
218222
CLANG_WARN_INT_CONVERSION = YES;
223+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
224+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
225+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
219226
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
227+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
228+
CLANG_WARN_STRICT_PROTOTYPES = YES;
220229
CLANG_WARN_SUSPICIOUS_MOVE = YES;
221230
CLANG_WARN_UNREACHABLE_CODE = YES;
222231
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -246,6 +255,7 @@
246255
SDKROOT = iphoneos;
247256
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
248257
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
258+
SWIFT_VERSION = 5.0;
249259
TARGETED_DEVICE_FAMILY = "1,2";
250260
};
251261
name = Debug;
@@ -254,21 +264,30 @@
254264
isa = XCBuildConfiguration;
255265
buildSettings = {
256266
ALWAYS_SEARCH_USER_PATHS = NO;
267+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
257268
CLANG_ANALYZER_NONNULL = YES;
258269
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
259270
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
260271
CLANG_CXX_LIBRARY = "libc++";
261272
CLANG_ENABLE_MODULES = YES;
262273
CLANG_ENABLE_OBJC_ARC = YES;
274+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
263275
CLANG_WARN_BOOL_CONVERSION = YES;
276+
CLANG_WARN_COMMA = YES;
264277
CLANG_WARN_CONSTANT_CONVERSION = YES;
278+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
265279
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
266280
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
267281
CLANG_WARN_EMPTY_BODY = YES;
268282
CLANG_WARN_ENUM_CONVERSION = YES;
269283
CLANG_WARN_INFINITE_RECURSION = YES;
270284
CLANG_WARN_INT_CONVERSION = YES;
285+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
286+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
287+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
271288
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
289+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
290+
CLANG_WARN_STRICT_PROTOTYPES = YES;
272291
CLANG_WARN_SUSPICIOUS_MOVE = YES;
273292
CLANG_WARN_UNREACHABLE_CODE = YES;
274293
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -290,6 +309,7 @@
290309
MTL_ENABLE_DEBUG_INFO = NO;
291310
SDKROOT = iphoneos;
292311
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
312+
SWIFT_VERSION = 5.0;
293313
TARGETED_DEVICE_FAMILY = "1,2";
294314
VALIDATE_PRODUCT = YES;
295315
};
@@ -311,7 +331,7 @@
311331
PRODUCT_NAME = "$(TARGET_NAME)";
312332
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-Carthage-iOS/PinLayout-Carthage-iOS-Bridging-Header.h";
313333
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
314-
SWIFT_VERSION = 3.0;
334+
SWIFT_VERSION = 5.0;
315335
};
316336
name = Debug;
317337
};
@@ -330,7 +350,7 @@
330350
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-Carthage-iOS";
331351
PRODUCT_NAME = "$(TARGET_NAME)";
332352
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-Carthage-iOS/PinLayout-Carthage-iOS-Bridging-Header.h";
333-
SWIFT_VERSION = 3.0;
353+
SWIFT_VERSION = 5.0;
334354
};
335355
name = Release;
336356
};

‎TestProjects/carthage/ios/PinLayout-Carthage-iOS/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
77
var window: UIWindow?
88

99

10-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
10+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1111
// Override point for customization after application launch.
1212
return true
1313
}

‎TestProjects/cocoapods/ios/PinLayout-iOS.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@
122122
isa = PBXProject;
123123
attributes = {
124124
LastSwiftUpdateCheck = 0830;
125-
LastUpgradeCheck = 0940;
125+
LastUpgradeCheck = 1100;
126126
ORGANIZATIONNAME = LayoutBox;
127127
TargetAttributes = {
128128
24C872DC1EE2CE0B007BFE47 = {
129129
CreatedOnToolsVersion = 8.3.2;
130-
LastSwiftMigration = 0900;
130+
LastSwiftMigration = 1100;
131131
ProvisioningStyle = Automatic;
132132
};
133133
};
134134
};
135135
buildConfigurationList = 24C872D81EE2CE0B007BFE47 /* Build configuration list for PBXProject "PinLayout-iOS" */;
136136
compatibilityVersion = "Xcode 3.2";
137-
developmentRegion = English;
137+
developmentRegion = en;
138138
hasScannedForEncodings = 0;
139139
knownRegions = (
140140
en,
@@ -170,7 +170,7 @@
170170
files = (
171171
);
172172
inputPaths = (
173-
"${SRCROOT}/Pods/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh",
173+
"${PODS_ROOT}/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh",
174174
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
175175
"${BUILT_PRODUCTS_DIR}/SwifterSwift/SwifterSwift.framework",
176176
);
@@ -181,7 +181,7 @@
181181
);
182182
runOnlyForDeploymentPostprocessing = 0;
183183
shellPath = /bin/sh;
184-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh\"\n";
184+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PinLayout-iOS/Pods-PinLayout-iOS-frameworks.sh\"\n";
185185
showEnvVarsInLog = 0;
186186
};
187187
5FB587B98FA7C73E8C04570F /* [CP] Check Pods Manifest.lock */ = {
@@ -241,6 +241,7 @@
241241
isa = XCBuildConfiguration;
242242
buildSettings = {
243243
ALWAYS_SEARCH_USER_PATHS = NO;
244+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
244245
CLANG_ANALYZER_NONNULL = YES;
245246
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
246247
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -300,6 +301,7 @@
300301
isa = XCBuildConfiguration;
301302
buildSettings = {
302303
ALWAYS_SEARCH_USER_PATHS = NO;
304+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
303305
CLANG_ANALYZER_NONNULL = YES;
304306
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
305307
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -361,7 +363,7 @@
361363
PRODUCT_NAME = "$(TARGET_NAME)";
362364
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-iOS/PinLayout-iOS-Bridging-Header.h";
363365
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
364-
SWIFT_VERSION = 4.0;
366+
SWIFT_VERSION = 5.0;
365367
};
366368
name = Debug;
367369
};
@@ -377,7 +379,7 @@
377379
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-iOS";
378380
PRODUCT_NAME = "$(TARGET_NAME)";
379381
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-iOS/PinLayout-iOS-Bridging-Header.h";
380-
SWIFT_VERSION = 4.0;
382+
SWIFT_VERSION = 5.0;
381383
};
382384
name = Release;
383385
};

0 commit comments

Comments
 (0)