Skip to content

Commit 6845e73

Browse files
author
Menno Lovink
committed
Merge branch 'feature/#1_Update_Swift_version_to_5.0' into develop
2 parents 4c3576a + 1f2361b commit 6845e73

File tree

117 files changed

+2255
-3170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2255
-3170
lines changed

‎.swift-version‎

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

‎ArrayPlusTuple.podspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = 'ArrayPlusTuple'
33
s.version = '1.0.0'
4+
s.swift_version = '5.0'
45
s.summary = 'Simple extension that makes creating tuples from arrays a breeze.'
56

67
s.description = <<-DESC
@@ -15,5 +16,5 @@ Originally created for MockNStub.
1516

1617
s.ios.deployment_target = '8.0'
1718
s.source_files = 'ArrayPlusTuple/Classes/**/*'
18-
s.dependency 'InjectableLoggers', '~> 1.2'
19+
s.dependency 'InjectableLoggers', '~> 2'
1920
end

‎ArrayPlusTuple/Classes/Array+tuple.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public extension Array {
22

3-
public var tuple: Any {
3+
var tuple: Any {
44
switch count {
55
case 0:
66
return ()

‎Example/ArrayPlusTuple.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
61FE2D279B7F41CA7A71318E /* Pods_ArrayPlusTuple_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ArrayPlusTuple_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3939
77B357480E2FA949855CB4D4 /* Pods-ArrayPlusTuple_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ArrayPlusTuple_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ArrayPlusTuple_Tests/Pods-ArrayPlusTuple_Tests.release.xcconfig"; sourceTree = "<group>"; };
4040
A090D53607D80EC7099C1692 /* Pods-ArrayPlusTuple_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ArrayPlusTuple_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ArrayPlusTuple_Example/Pods-ArrayPlusTuple_Example.debug.xcconfig"; sourceTree = "<group>"; };
41-
CC021792C9B872913E5BB2DF /* ArrayPlusTuple.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = ArrayPlusTuple.podspec; path = ../ArrayPlusTuple.podspec; sourceTree = "<group>"; };
41+
CC021792C9B872913E5BB2DF /* ArrayPlusTuple.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = ArrayPlusTuple.podspec; path = ../ArrayPlusTuple.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
4242
DE18FD3D20C2B78500E2CBA1 /* ArraySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArraySpec.swift; sourceTree = "<group>"; };
4343
DEDE956620C2D74F00B342CB /* Fastfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Fastfile; path = ../fastlane/Fastfile; sourceTree = "<group>"; };
4444
/* End PBXFileReference section */
@@ -199,7 +199,7 @@
199199
isa = PBXProject;
200200
attributes = {
201201
LastSwiftUpdateCheck = 0830;
202-
LastUpgradeCheck = 0830;
202+
LastUpgradeCheck = 1030;
203203
ORGANIZATIONNAME = CocoaPods;
204204
TargetAttributes = {
205205
607FACCF1AFB9204008FA782 = {
@@ -218,6 +218,7 @@
218218
developmentRegion = English;
219219
hasScannedForEncodings = 0;
220220
knownRegions = (
221+
English,
221222
en,
222223
Base,
223224
);
@@ -257,20 +258,18 @@
257258
files = (
258259
);
259260
inputPaths = (
260-
"${SRCROOT}/Pods/Target Support Files/Pods-ArrayPlusTuple_Tests/Pods-ArrayPlusTuple_Tests-frameworks.sh",
261+
"${PODS_ROOT}/Target Support Files/Pods-ArrayPlusTuple_Tests/Pods-ArrayPlusTuple_Tests-frameworks.sh",
261262
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
262263
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
263-
"${BUILT_PRODUCTS_DIR}/QuickGWT/QuickGWT.framework",
264264
);
265265
name = "[CP] Embed Pods Frameworks";
266266
outputPaths = (
267267
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
268268
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
269-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QuickGWT.framework",
270269
);
271270
runOnlyForDeploymentPostprocessing = 0;
272271
shellPath = /bin/sh;
273-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ArrayPlusTuple_Tests/Pods-ArrayPlusTuple_Tests-frameworks.sh\"\n";
272+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ArrayPlusTuple_Tests/Pods-ArrayPlusTuple_Tests-frameworks.sh\"\n";
274273
showEnvVarsInLog = 0;
275274
};
276275
DBF80F25CCECDFD4B0962854 /* [CP] Check Pods Manifest.lock */ = {
@@ -315,7 +314,7 @@
315314
files = (
316315
);
317316
inputPaths = (
318-
"${SRCROOT}/Pods/Target Support Files/Pods-ArrayPlusTuple_Example/Pods-ArrayPlusTuple_Example-frameworks.sh",
317+
"${PODS_ROOT}/Target Support Files/Pods-ArrayPlusTuple_Example/Pods-ArrayPlusTuple_Example-frameworks.sh",
319318
"${BUILT_PRODUCTS_DIR}/ArrayPlusTuple/ArrayPlusTuple.framework",
320319
"${BUILT_PRODUCTS_DIR}/InjectableLoggers/InjectableLoggers.framework",
321320
);
@@ -326,7 +325,7 @@
326325
);
327326
runOnlyForDeploymentPostprocessing = 0;
328327
shellPath = /bin/sh;
329-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ArrayPlusTuple_Example/Pods-ArrayPlusTuple_Example-frameworks.sh\"\n";
328+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ArrayPlusTuple_Example/Pods-ArrayPlusTuple_Example-frameworks.sh\"\n";
330329
showEnvVarsInLog = 0;
331330
};
332331
/* End PBXShellScriptBuildPhase section */
@@ -363,6 +362,7 @@
363362
isa = XCBuildConfiguration;
364363
buildSettings = {
365364
ALWAYS_SEARCH_USER_PATHS = NO;
365+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
366366
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
367367
CLANG_CXX_LIBRARY = "libc++";
368368
CLANG_ENABLE_MODULES = YES;
@@ -371,12 +371,14 @@
371371
CLANG_WARN_BOOL_CONVERSION = YES;
372372
CLANG_WARN_COMMA = YES;
373373
CLANG_WARN_CONSTANT_CONVERSION = YES;
374+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
374375
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
375376
CLANG_WARN_EMPTY_BODY = YES;
376377
CLANG_WARN_ENUM_CONVERSION = YES;
377378
CLANG_WARN_INFINITE_RECURSION = YES;
378379
CLANG_WARN_INT_CONVERSION = YES;
379380
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
381+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
380382
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
381383
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
382384
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -409,13 +411,15 @@
409411
ONLY_ACTIVE_ARCH = YES;
410412
SDKROOT = iphoneos;
411413
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
414+
SWIFT_VERSION = 5.0;
412415
};
413416
name = Debug;
414417
};
415418
607FACEE1AFB9204008FA782 /* Release */ = {
416419
isa = XCBuildConfiguration;
417420
buildSettings = {
418421
ALWAYS_SEARCH_USER_PATHS = NO;
422+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
419423
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
420424
CLANG_CXX_LIBRARY = "libc++";
421425
CLANG_ENABLE_MODULES = YES;
@@ -424,12 +428,14 @@
424428
CLANG_WARN_BOOL_CONVERSION = YES;
425429
CLANG_WARN_COMMA = YES;
426430
CLANG_WARN_CONSTANT_CONVERSION = YES;
431+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
427432
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
428433
CLANG_WARN_EMPTY_BODY = YES;
429434
CLANG_WARN_ENUM_CONVERSION = YES;
430435
CLANG_WARN_INFINITE_RECURSION = YES;
431436
CLANG_WARN_INT_CONVERSION = YES;
432437
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
438+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
433439
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
434440
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
435441
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -454,6 +460,7 @@
454460
MTL_ENABLE_DEBUG_INFO = NO;
455461
SDKROOT = iphoneos;
456462
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
463+
SWIFT_VERSION = 5.0;
457464
VALIDATE_PRODUCT = YES;
458465
};
459466
name = Release;
@@ -469,7 +476,7 @@
469476
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
470477
PRODUCT_NAME = "$(TARGET_NAME)";
471478
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
472-
SWIFT_VERSION = 4.0;
479+
SWIFT_VERSION = 5.0;
473480
};
474481
name = Debug;
475482
};
@@ -484,7 +491,7 @@
484491
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
485492
PRODUCT_NAME = "$(TARGET_NAME)";
486493
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
487-
SWIFT_VERSION = 4.0;
494+
SWIFT_VERSION = 5.0;
488495
};
489496
name = Release;
490497
};
@@ -505,7 +512,7 @@
505512
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
506513
PRODUCT_NAME = "$(TARGET_NAME)";
507514
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
508-
SWIFT_VERSION = 4.0;
515+
SWIFT_VERSION = 5.0;
509516
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ArrayPlusTuple_Example.app/ArrayPlusTuple_Example";
510517
};
511518
name = Debug;
@@ -523,7 +530,7 @@
523530
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
524531
PRODUCT_NAME = "$(TARGET_NAME)";
525532
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
526-
SWIFT_VERSION = 4.0;
533+
SWIFT_VERSION = 5.0;
527534
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ArrayPlusTuple_Example.app/ArrayPlusTuple_Example";
528535
};
529536
name = Release;

‎Example/ArrayPlusTuple.xcodeproj/xcshareddata/xcschemes/ArrayPlusTuple-Example.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
<TestableReference
@@ -70,7 +69,6 @@
7069
buildConfiguration = "Debug"
7170
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7271
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7472
launchStyle = "0"
7573
useCustomWorkingDirectory = "NO"
7674
ignoresPersistentStateOnLaunch = "NO"

‎Example/ArrayPlusTuple/AppDelegate.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import ArrayPlusTuple
1212
@UIApplicationMain
1313
class AppDelegate: UIResponder, UIApplicationDelegate {
1414

15-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
16-
15+
internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1716

1817
let tuple1 = [1, 2, "three"].tuple
18+
print(tuple1)
1919

2020
let tuple2 = [1, 2, "three"].tuple as? (Int, Int, String)
21-
21+
print(tuple2)
2222

2323
return true
2424
}

‎Example/Podfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ target 'ArrayPlusTuple_Example' do
66
target 'ArrayPlusTuple_Tests' do
77
inherit! :search_paths
88

9-
pod 'Quick', '~> 1.3.0'
10-
pod 'QuickGWT', '~> 1.0.0'
11-
pod 'Nimble', '~> 7.0.2'
9+
pod 'Quick', '~> 2.0'
10+
pod 'Nimble', '~> 8.0'
1211
end
1312
end

‎Example/Podfile.lock‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
PODS:
22
- ArrayPlusTuple (1.0.0):
3-
- InjectableLoggers (~> 1.2)
4-
- InjectableLoggers (1.2.0)
5-
- Nimble (7.0.3)
6-
- Quick (1.3.0)
7-
- QuickGWT (1.0.0):
8-
- Quick (~> 1.3)
3+
- InjectableLoggers (~> 2)
4+
- InjectableLoggers (2.0.0)
5+
- Nimble (8.0.2)
6+
- Quick (2.1.0)
97

108
DEPENDENCIES:
119
- ArrayPlusTuple (from `../`)
12-
- Nimble (~> 7.0.2)
13-
- Quick (~> 1.3.0)
14-
- QuickGWT (~> 1.0.0)
10+
- Nimble (~> 8.0)
11+
- Quick (~> 2.0)
1512

1613
SPEC REPOS:
1714
https://github.com/cocoapods/specs.git:
1815
- InjectableLoggers
1916
- Nimble
2017
- Quick
21-
- QuickGWT
2218

2319
EXTERNAL SOURCES:
2420
ArrayPlusTuple:
2521
:path: "../"
2622

2723
SPEC CHECKSUMS:
28-
ArrayPlusTuple: 0441a0a339b69ee8589dd927d03912eeb7a4a107
29-
InjectableLoggers: f63523bbb55c5b41ba7cb6a053f5de7aca20a009
30-
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
31-
Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f
32-
QuickGWT: 1c95a0ec7bfb87f7afba8d6ad92af6c526402d6e
24+
ArrayPlusTuple: a4fb024c7d8b1c743bb515cad5683ad3778d6809
25+
InjectableLoggers: a21d5df992e5c85533a9a5026152e1c8edef7bbe
26+
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
27+
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
3328

34-
PODFILE CHECKSUM: dc94abf60016292c31798fc970bfd6c1796255e5
29+
PODFILE CHECKSUM: 5ad8c9b3c7b2df83866948a7c50c0e11f27ece48
3530

36-
COCOAPODS: 1.5.3
31+
COCOAPODS: 1.7.4

‎Example/Pods/InjectableLoggers/InjectableLoggers/Classes/Classes/Logger.swift‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/InjectableLoggers/InjectableLoggers/Classes/Enums/LogLevel.swift‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)