Skip to content

Commit 7627d0f

Browse files
markuswntrmarkuswntr
committed
Remove custom Result and update swift version
1 parent a97fe67 commit 7627d0f

24 files changed

+136
-193
lines changed

‎.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: swift
2-
osx_image: xcode10.1
2+
osx_image: xcode10.2
33

44
# Dependencies
55
before_install: chmod +x ./.travis/deps.sh
@@ -24,8 +24,8 @@ notifications:
2424
matrix:
2525
include:
2626
# iOS
27-
- env: DESTINATION="OS=12.1,name=iPhone XS Max" SCHEME="Networking iOS" RUN_TESTS="YES" POD_LINT="YES"
28-
- env: DESTINATION="OS=11.3,name=iPhone X" SCHEME="Networking iOS" RUN_TESTS="YES" POD_LINT="NO"
27+
- env: DESTINATION="OS=12.3,name=iPhone XS Max" SCHEME="Networking iOS" RUN_TESTS="YES" POD_LINT="YES"
28+
- env: DESTINATION="OS=11.4,name=iPhone X" SCHEME="Networking iOS" RUN_TESTS="YES" POD_LINT="NO"
2929
- env: DESTINATION="OS=10.3.1,name=iPhone 7 Plus" SCHEME="Networking iOS" RUN_TESTS="YES" POD_LINT="NO"
3030
- env: DESTINATION="OS=9.3,name=iPhone 6" SCHEME="Networking iOS" RUN_TESTS="YES" POD_LINT="NO"
3131
# watchOS
@@ -34,8 +34,8 @@ matrix:
3434
- env: DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm" SCHEME="Networking watchOS" RUN_TESTS="NO" POD_LINT="NO"
3535
- env: DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="Networking watchOS" RUN_TESTS="NO" POD_LINT="NO"
3636
# tvOS
37-
# - env: DESTINATION="OS=12.1,name=Apple TV 4K" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
38-
# - env: DESTINATION="OS=11.3,name=Apple TV 4K" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
39-
# - env: DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
40-
# - env: DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
37+
- env: DESTINATION="OS=12.2,name=Apple TV 4K" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
38+
- env: DESTINATION="OS=11.3,name=Apple TV 4K" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
39+
- env: DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
40+
- env: DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="Networking tvOS" RUN_TESTS="YES" POD_LINT="NO"
4141

‎.travis/deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
2-
gem install cocoapods --no-rdoc --no-ri --no-document --quiet;
2+
gem install cocoapods --no-document --quiet;
33
pod install;

‎CellularNetworking.podspec

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
2-
spec.version = '5.0'
3-
spec.swift_version = '4.2'
2+
spec.version = '5.1'
3+
spec.swift_version = '5.0'
44
spec.module_name = 'Networking'
55
spec.name = 'CellularNetworking'
66
spec.summary = 'HTTP Networking Framework in Swift by CELLULAR.'
@@ -10,22 +10,21 @@ Pod::Spec.new do |spec|
1010
spec.source = { :git => 'https://github.com/cellular/networking-swift.git', :tag => spec.version.to_s }
1111

1212
# Deployment Targets
13-
spec.ios.deployment_target = '9.0'
14-
spec.tvos.deployment_target = '9.0'
15-
spec.watchos.deployment_target = '2.0'
13+
spec.ios.deployment_target = '10.0'
14+
spec.tvos.deployment_target = '10.0'
15+
spec.watchos.deployment_target = '3.0'
1616

1717
# Core Subspec
1818

1919
spec.subspec 'Core' do |sub|
20-
sub.dependency 'CELLULAR/Result', '~> 4.1.0'
21-
sub.dependency 'CELLULAR/Locking', '~> 4.1.0'
20+
sub.dependency 'CELLULAR/Locking', '~> 5.1'
2221
sub.source_files = 'Sources/Networking/Core/**/*.swift'
2322
end
2423

2524
# Provider Subspecs
2625

2726
spec.subspec 'Alamofire' do |sub|
28-
sub.dependency 'Alamofire', '~> 4.7'
27+
sub.dependency 'Alamofire', '~> 5.0.0-beta.5'
2928
sub.dependency 'CellularNetworking/Core'
3029
sub.source_files = 'Sources/Networking/Provider/Alamofire.swift'
3130
end
@@ -43,7 +42,7 @@ Pod::Spec.new do |spec|
4342
end
4443

4544
spec.subspec 'Unbox' do |sub|
46-
sub.dependency 'Unbox', '~> 3.0'
45+
sub.dependency 'Unbox', '~> 4.0.0'
4746
sub.dependency 'CellularNetworking/Core'
4847
sub.source_files = 'Sources/Networking/Serializer/Unbox.swift'
4948
end

‎CellularNetworking.xcodeproj/project.pbxproj

Lines changed: 22 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@
523523
280447022191C77F00AB1C3A /* Sources */,
524524
280447032191C77F00AB1C3A /* Frameworks */,
525525
280447042191C77F00AB1C3A /* Resources */,
526-
CA38C5EB0926BC562C8FC1A3 /* [CP] Embed Pods Frameworks */,
527526
);
528527
buildRules = (
529528
);
@@ -562,7 +561,6 @@
562561
280447822191C99200AB1C3A /* Sources */,
563562
280447832191C99200AB1C3A /* Frameworks */,
564563
280447842191C99200AB1C3A /* Resources */,
565-
FC173AD10397ACAB89A0A524 /* [CP] Embed Pods Frameworks */,
566564
);
567565
buildRules = (
568566
);
@@ -605,18 +603,23 @@
605603
TargetAttributes = {
606604
280446FC2191C77F00AB1C3A = {
607605
CreatedOnToolsVersion = 10.1;
606+
LastSwiftMigration = 1100;
608607
};
609608
280447052191C77F00AB1C3A = {
610609
CreatedOnToolsVersion = 10.1;
610+
LastSwiftMigration = 1100;
611611
};
612612
2804477D2191C99200AB1C3A = {
613613
CreatedOnToolsVersion = 10.1;
614+
LastSwiftMigration = 1100;
614615
};
615616
280447852191C99200AB1C3A = {
616617
CreatedOnToolsVersion = 10.1;
618+
LastSwiftMigration = 1100;
617619
};
618620
280447992191C9A100AB1C3A = {
619621
CreatedOnToolsVersion = 10.1;
622+
LastSwiftMigration = 1100;
620623
};
621624
};
622625
};
@@ -626,6 +629,7 @@
626629
hasScannedForEncodings = 0;
627630
knownRegions = (
628631
en,
632+
Base,
629633
);
630634
mainGroup = 280446F32191C77F00AB1C3A;
631635
productRefGroup = 280446FE2191C77F00AB1C3A /* Products */;
@@ -756,32 +760,6 @@
756760
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
757761
showEnvVarsInLog = 0;
758762
};
759-
CA38C5EB0926BC562C8FC1A3 /* [CP] Embed Pods Frameworks */ = {
760-
isa = PBXShellScriptBuildPhase;
761-
buildActionMask = 2147483647;
762-
files = (
763-
);
764-
inputFileListPaths = (
765-
);
766-
inputPaths = (
767-
"${SRCROOT}/Pods/Target Support Files/Pods-Networking iOSTests/Pods-Networking iOSTests-frameworks.sh",
768-
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
769-
"${BUILT_PRODUCTS_DIR}/CELLULAR-iOS/CELLULAR.framework",
770-
"${BUILT_PRODUCTS_DIR}/Unbox-iOS/Unbox.framework",
771-
);
772-
name = "[CP] Embed Pods Frameworks";
773-
outputFileListPaths = (
774-
);
775-
outputPaths = (
776-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
777-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CELLULAR.framework",
778-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Unbox.framework",
779-
);
780-
runOnlyForDeploymentPostprocessing = 0;
781-
shellPath = /bin/sh;
782-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Networking iOSTests/Pods-Networking iOSTests-frameworks.sh\"\n";
783-
showEnvVarsInLog = 0;
784-
};
785763
EAC7D51C9E129DB20E87D9B3 /* [CP] Check Pods Manifest.lock */ = {
786764
isa = PBXShellScriptBuildPhase;
787765
buildActionMask = 2147483647;
@@ -826,32 +804,6 @@
826804
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
827805
showEnvVarsInLog = 0;
828806
};
829-
FC173AD10397ACAB89A0A524 /* [CP] Embed Pods Frameworks */ = {
830-
isa = PBXShellScriptBuildPhase;
831-
buildActionMask = 2147483647;
832-
files = (
833-
);
834-
inputFileListPaths = (
835-
);
836-
inputPaths = (
837-
"${SRCROOT}/Pods/Target Support Files/Pods-Networking tvOSTests/Pods-Networking tvOSTests-frameworks.sh",
838-
"${BUILT_PRODUCTS_DIR}/Alamofire-tvOS/Alamofire.framework",
839-
"${BUILT_PRODUCTS_DIR}/CELLULAR-tvOS/CELLULAR.framework",
840-
"${BUILT_PRODUCTS_DIR}/Unbox-tvOS/Unbox.framework",
841-
);
842-
name = "[CP] Embed Pods Frameworks";
843-
outputFileListPaths = (
844-
);
845-
outputPaths = (
846-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
847-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CELLULAR.framework",
848-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Unbox.framework",
849-
);
850-
runOnlyForDeploymentPostprocessing = 0;
851-
shellPath = /bin/sh;
852-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Networking tvOSTests/Pods-Networking tvOSTests-frameworks.sh\"\n";
853-
showEnvVarsInLog = 0;
854-
};
855807
/* End PBXShellScriptBuildPhase section */
856808

857809
/* Begin PBXSourcesBuildPhase section */
@@ -1049,15 +1001,17 @@
10491001
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10501002
GCC_WARN_UNUSED_FUNCTION = YES;
10511003
GCC_WARN_UNUSED_VARIABLE = YES;
1052-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1004+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
10531005
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
10541006
MTL_FAST_MATH = YES;
10551007
ONLY_ACTIVE_ARCH = YES;
10561008
SDKROOT = iphoneos;
10571009
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10581010
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1011+
TVOS_DEPLOYMENT_TARGET = 10.0;
10591012
VERSIONING_SYSTEM = "apple-generic";
10601013
VERSION_INFO_PREFIX = "";
1014+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
10611015
};
10621016
name = Debug;
10631017
};
@@ -1107,15 +1061,17 @@
11071061
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11081062
GCC_WARN_UNUSED_FUNCTION = YES;
11091063
GCC_WARN_UNUSED_VARIABLE = YES;
1110-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1064+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
11111065
MTL_ENABLE_DEBUG_INFO = NO;
11121066
MTL_FAST_MATH = YES;
11131067
SDKROOT = iphoneos;
11141068
SWIFT_COMPILATION_MODE = wholemodule;
11151069
SWIFT_OPTIMIZATION_LEVEL = "-O";
1070+
TVOS_DEPLOYMENT_TARGET = 10.0;
11161071
VALIDATE_PRODUCT = YES;
11171072
VERSIONING_SYSTEM = "apple-generic";
11181073
VERSION_INFO_PREFIX = "";
1074+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
11191075
};
11201076
name = Release;
11211077
};
@@ -1140,7 +1096,7 @@
11401096
PRODUCT_BUNDLE_IDENTIFIER = de.cellular.ios.Networking;
11411097
PRODUCT_NAME = Networking;
11421098
SKIP_INSTALL = YES;
1143-
SWIFT_VERSION = 4.2;
1099+
SWIFT_VERSION = 5.0;
11441100
TARGETED_DEVICE_FAMILY = "1,2";
11451101
};
11461102
name = Debug;
@@ -1166,7 +1122,7 @@
11661122
PRODUCT_BUNDLE_IDENTIFIER = de.cellular.ios.Networking;
11671123
PRODUCT_NAME = Networking;
11681124
SKIP_INSTALL = YES;
1169-
SWIFT_VERSION = 4.2;
1125+
SWIFT_VERSION = 5.0;
11701126
TARGETED_DEVICE_FAMILY = "1,2";
11711127
};
11721128
name = Release;
@@ -1185,7 +1141,7 @@
11851141
);
11861142
PRODUCT_BUNDLE_IDENTIFIER = de.cellular.ios.NetworkingTests;
11871143
PRODUCT_NAME = "$(TARGET_NAME)";
1188-
SWIFT_VERSION = 4.2;
1144+
SWIFT_VERSION = 5.0;
11891145
TARGETED_DEVICE_FAMILY = "1,2";
11901146
};
11911147
name = Debug;
@@ -1204,7 +1160,7 @@
12041160
);
12051161
PRODUCT_BUNDLE_IDENTIFIER = de.cellular.ios.NetworkingTests;
12061162
PRODUCT_NAME = "$(TARGET_NAME)";
1207-
SWIFT_VERSION = 4.2;
1163+
SWIFT_VERSION = 5.0;
12081164
TARGETED_DEVICE_FAMILY = "1,2";
12091165
};
12101166
name = Release;
@@ -1231,9 +1187,8 @@
12311187
PRODUCT_NAME = Networking;
12321188
SDKROOT = appletvos;
12331189
SKIP_INSTALL = YES;
1234-
SWIFT_VERSION = 4.2;
1190+
SWIFT_VERSION = 5.0;
12351191
TARGETED_DEVICE_FAMILY = 3;
1236-
TVOS_DEPLOYMENT_TARGET = 9.0;
12371192
};
12381193
name = Debug;
12391194
};
@@ -1259,9 +1214,8 @@
12591214
PRODUCT_NAME = Networking;
12601215
SDKROOT = appletvos;
12611216
SKIP_INSTALL = YES;
1262-
SWIFT_VERSION = 4.2;
1217+
SWIFT_VERSION = 5.0;
12631218
TARGETED_DEVICE_FAMILY = 3;
1264-
TVOS_DEPLOYMENT_TARGET = 9.0;
12651219
};
12661220
name = Release;
12671221
};
@@ -1281,7 +1235,7 @@
12811235
PRODUCT_BUNDLE_IDENTIFIER = de.cellular.ios.NetworkingTests;
12821236
PRODUCT_NAME = "$(TARGET_NAME)";
12831237
SDKROOT = appletvos;
1284-
SWIFT_VERSION = 4.2;
1238+
SWIFT_VERSION = 5.0;
12851239
TARGETED_DEVICE_FAMILY = 3;
12861240
TVOS_DEPLOYMENT_TARGET = 12.1;
12871241
};
@@ -1303,7 +1257,7 @@
13031257
PRODUCT_BUNDLE_IDENTIFIER = de.cellular.ios.NetworkingTests;
13041258
PRODUCT_NAME = "$(TARGET_NAME)";
13051259
SDKROOT = appletvos;
1306-
SWIFT_VERSION = 4.2;
1260+
SWIFT_VERSION = 5.0;
13071261
TARGETED_DEVICE_FAMILY = 3;
13081262
TVOS_DEPLOYMENT_TARGET = 12.1;
13091263
};
@@ -1331,9 +1285,8 @@
13311285
PRODUCT_NAME = Networking;
13321286
SDKROOT = watchos;
13331287
SKIP_INSTALL = YES;
1334-
SWIFT_VERSION = 4.2;
1288+
SWIFT_VERSION = 5.0;
13351289
TARGETED_DEVICE_FAMILY = 4;
1336-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13371290
};
13381291
name = Debug;
13391292
};
@@ -1359,9 +1312,8 @@
13591312
PRODUCT_NAME = Networking;
13601313
SDKROOT = watchos;
13611314
SKIP_INSTALL = YES;
1362-
SWIFT_VERSION = 4.2;
1315+
SWIFT_VERSION = 5.0;
13631316
TARGETED_DEVICE_FAMILY = 4;
1364-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13651317
};
13661318
name = Release;
13671319
};

‎CellularNetworking.xcodeproj/xcshareddata/xcschemes/Networking iOS.xcscheme

Lines changed: 12 additions & 16 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 = "1010"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,9 +40,18 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES"
4344
codeCoverageEnabled = "YES"
44-
onlyGenerateCoverageForSpecifiedTargets = "YES"
45-
shouldUseLaunchSchemeArgsEnv = "YES">
45+
onlyGenerateCoverageForSpecifiedTargets = "YES">
46+
<MacroExpansion>
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "280446FC2191C77F00AB1C3A"
50+
BuildableName = "Networking.framework"
51+
BlueprintName = "Networking iOS"
52+
ReferencedContainer = "container:CellularNetworking.xcodeproj">
53+
</BuildableReference>
54+
</MacroExpansion>
4655
<CodeCoverageTargets>
4756
<BuildableReference
4857
BuildableIdentifier = "primary"
@@ -65,17 +74,6 @@
6574
</BuildableReference>
6675
</TestableReference>
6776
</Testables>
68-
<MacroExpansion>
69-
<BuildableReference
70-
BuildableIdentifier = "primary"
71-
BlueprintIdentifier = "280446FC2191C77F00AB1C3A"
72-
BuildableName = "Networking.framework"
73-
BlueprintName = "Networking iOS"
74-
ReferencedContainer = "container:CellularNetworking.xcodeproj">
75-
</BuildableReference>
76-
</MacroExpansion>
77-
<AdditionalOptions>
78-
</AdditionalOptions>
7977
</TestAction>
8078
<LaunchAction
8179
buildConfiguration = "Debug"
@@ -96,8 +94,6 @@
9694
ReferencedContainer = "container:CellularNetworking.xcodeproj">
9795
</BuildableReference>
9896
</MacroExpansion>
99-
<AdditionalOptions>
100-
</AdditionalOptions>
10197
</LaunchAction>
10298
<ProfileAction
10399
buildConfiguration = "Release"

‎CellularNetworking.xcodeproj/xcshareddata/xcschemes/Networking tvOS.xcscheme

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

0 commit comments

Comments
 (0)