Skip to content

Commit 784f401

Browse files
lightsprint09lightsprint09
authored
Merge pull request #95 from dbsystel/v2.0
V2.0
2 parents dc0c38c + 01cbab6 commit 784f401

23 files changed

+315
-301
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ matrix:
1717
script:
1818
- swift test --verbose
1919
- os: osx
20-
osx_image: xcode9.4
20+
osx_image: xcode11
2121
env: "macOS"
2222
skip-cleanup: true
2323
before_install:
@@ -26,7 +26,7 @@ matrix:
2626
- set -o pipefail && xcodebuild -scheme DBNetworkStack -destination "platform=macOS" test | xcpretty
2727
- set -o pipefail && xcodebuild -scheme DBNetworkStack -destination "platform=tvOS Simulator,name=Apple TV" test | xcpretty
2828
- set -o pipefail && xcodebuild -scheme DBNetworkStack -destination "platform=watchOS Simulator,name=Apple Watch - 38mm" build | xcpretty
29-
- set -o pipefail && xcodebuild -scheme DBNetworkStack -destination "platform=iOS Simulator,name=iPhone SE" test | xcpretty
29+
- set -o pipefail && xcodebuild -scheme DBNetworkStack -destination "platform=iOS Simulator,name=iPhone 8" test | xcpretty
3030
- swift test & pod spec lint --allow-warnings & carthage build --no-skip-current
3131
- jazzy --clean --author "DBSystel" --github_url https://github.com/dbsystel/DBNetworkStack --module DBNetworkStack --output docs
3232
after_success:

‎DBNetworkStack.podspec‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎DBNetworkStack.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@
1919
C60BE6901D6B2C46006B0364 /* Resource.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60BE6801D6B2C46006B0364 /* Resource.swift */; };
2020
C60BE6A31D6B3807006B0364 /* NetworkServiceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60BE6A01D6B3807006B0364 /* NetworkServiceTest.swift */; };
2121
C60BE6AD1D6B3E81006B0364 /* NetworkTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60BE6AC1D6B3E81006B0364 /* NetworkTask.swift */; };
22-
C60FF0F31E5C94CD00818031 /* URLRequestConvertibleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60FF0F11E5C94AC00818031 /* URLRequestConvertibleTest.swift */; };
22+
C60FF0F31E5C94CD00818031 /* URLRequestTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60FF0F11E5C94AC00818031 /* URLRequestTest.swift */; };
2323
C61E77871E48CAFE00D55BB2 /* NetworkServiceMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6461F0A1E016C7700E0B081 /* NetworkServiceMock.swift */; };
2424
C61E77891E49A57A00D55BB2 /* NetworkServiceMockTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E77881E49A57A00D55BB2 /* NetworkServiceMockTest.swift */; };
2525
C61E778B1E49B53700D55BB2 /* RetryNetworkserviceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E778A1E49B53700D55BB2 /* RetryNetworkserviceTest.swift */; };
2626
C61E778C1E49D8A900D55BB2 /* NetworkTaskMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C40B9FD1D9D66A600620563 /* NetworkTaskMock.swift */; };
27-
C622A7961E5C7F6500BB3D17 /* URLRequestConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = C622A7951E5C7F6500BB3D17 /* URLRequestConvertible.swift */; };
28-
C62925AE1FC5900000607AEA /* URLRequestConvertible+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C62925AD1FC5900000607AEA /* URLRequestConvertible+Modifications.swift */; };
27+
C622A7961E5C7F6500BB3D17 /* URLRequest+Init.swift in Sources */ = {isa = PBXBuildFile; fileRef = C622A7951E5C7F6500BB3D17 /* URLRequest+Init.swift */; };
28+
C62925AE1FC5900000607AEA /* URLRequest+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C62925AD1FC5900000607AEA /* URLRequest+Modifications.swift */; };
2929
C6363D8F1F4ED1500052E9BD /* URLSession+NetworkAccessTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6363D8D1F4ED13C0052E9BD /* URLSession+NetworkAccessTest.swift */; };
3030
C6363D901F4ED1950052E9BD /* URLSessionMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6363D8B1F4ED0840052E9BD /* URLSessionMock.swift */; };
3131
C6363D911F4ED2030052E9BD /* DefaultMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C21A3A1F21FD150004A7EB /* DefaultMocks.swift */; };
3232
C6461F021E01678100E0B081 /* RetryNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6461F011E01678100E0B081 /* RetryNetworkService.swift */; };
33+
C6576B6E21DDFD25009AC99C /* NetworkService+Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6576B6D21DDFD25009AC99C /* NetworkService+Result.swift */; };
3334
C65AA9A221185F68007529BF /* ContainerNetworkTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = C65AA9A121185F68007529BF /* ContainerNetworkTask.swift */; };
3435
C65AA9A52118723F007529BF /* ContainerNetworkTaskTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C65AA9A321187234007529BF /* ContainerNetworkTaskTest.swift */; };
3536
C66C7B961FE96CD0009B8C78 /* Resource+Inspect.swift in Sources */ = {isa = PBXBuildFile; fileRef = C66C7B951FE96CD0009B8C78 /* Resource+Inspect.swift */; };
@@ -77,15 +78,16 @@
7778
C60BE6801D6B2C46006B0364 /* Resource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Resource.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
7879
C60BE6A01D6B3807006B0364 /* NetworkServiceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NetworkServiceTest.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
7980
C60BE6AC1D6B3E81006B0364 /* NetworkTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = NetworkTask.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
80-
C60FF0F11E5C94AC00818031 /* URLRequestConvertibleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequestConvertibleTest.swift; sourceTree = "<group>"; };
81+
C60FF0F11E5C94AC00818031 /* URLRequestTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequestTest.swift; sourceTree = "<group>"; };
8182
C61E77881E49A57A00D55BB2 /* NetworkServiceMockTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkServiceMockTest.swift; sourceTree = "<group>"; };
8283
C61E778A1E49B53700D55BB2 /* RetryNetworkserviceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryNetworkserviceTest.swift; sourceTree = "<group>"; };
83-
C622A7951E5C7F6500BB3D17 /* URLRequestConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLRequestConvertible.swift; sourceTree = "<group>"; };
84-
C62925AD1FC5900000607AEA /* URLRequestConvertible+Modifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequestConvertible+Modifications.swift"; sourceTree = "<group>"; };
84+
C622A7951E5C7F6500BB3D17 /* URLRequest+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLRequest+Init.swift"; sourceTree = "<group>"; };
85+
C62925AD1FC5900000607AEA /* URLRequest+Modifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Modifications.swift"; sourceTree = "<group>"; };
8586
C6363D8B1F4ED0840052E9BD /* URLSessionMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSessionMock.swift; sourceTree = "<group>"; };
8687
C6363D8D1F4ED13C0052E9BD /* URLSession+NetworkAccessTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLSession+NetworkAccessTest.swift"; sourceTree = "<group>"; };
8788
C6461F011E01678100E0B081 /* RetryNetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryNetworkService.swift; sourceTree = "<group>"; };
8889
C6461F0A1E016C7700E0B081 /* NetworkServiceMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkServiceMock.swift; sourceTree = "<group>"; };
90+
C6576B6D21DDFD25009AC99C /* NetworkService+Result.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NetworkService+Result.swift"; sourceTree = "<group>"; };
8991
C65AA9A121185F68007529BF /* ContainerNetworkTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerNetworkTask.swift; sourceTree = "<group>"; };
9092
C65AA9A321187234007529BF /* ContainerNetworkTaskTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContainerNetworkTaskTest.swift; sourceTree = "<group>"; };
9193
C66C7B951FE96CD0009B8C78 /* Resource+Inspect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Resource+Inspect.swift"; sourceTree = "<group>"; };
@@ -166,12 +168,12 @@
166168
children = (
167169
C6A5DED81D76A05300BC38B1 /* Helpers */,
168170
C6A5DED21D760C9E00BC38B1 /* Mocks */,
169-
C6E5A4D51E2FBDDD00F966DB /* NetworkServiceTests */,
170-
C6E5A4D61E2FBE0000F966DB /* RessourceTests */,
171+
C6E5A4D51E2FBDDD00F966DB /* NetworkService */,
172+
C6E5A4D61E2FBE0000F966DB /* Ressource */,
171173
C6F7E30E1E49DC4900FA625F /* NetworkTaskMockTests.swift */,
172174
C699E0761D917501006FE7C6 /* NetworkErrorTest.swift */,
173175
7C653BC81E09325500199993 /* NetworkResponseProcessorTest.swift */,
174-
C60FF0F11E5C94AC00818031 /* URLRequestConvertibleTest.swift */,
176+
C60FF0F11E5C94AC00818031 /* URLRequestTest.swift */,
175177
C6363D8D1F4ED13C0052E9BD /* URLSession+NetworkAccessTest.swift */,
176178
C6F3A400211D732500BF0086 /* URL+StaticStringInitTest.swift */,
177179
);
@@ -217,15 +219,16 @@
217219
C6461F011E01678100E0B081 /* RetryNetworkService.swift */,
218220
C6461F0A1E016C7700E0B081 /* NetworkServiceMock.swift */,
219221
C6C21A381F21F90A0004A7EB /* NetworkResponseProcessor.swift */,
222+
C6576B6D21DDFD25009AC99C /* NetworkService+Result.swift */,
220223
);
221224
name = NetworkService;
222225
sourceTree = "<group>";
223226
};
224227
C6E5A4D21E2FBD2B00F966DB /* NetworkRequest */ = {
225228
isa = PBXGroup;
226229
children = (
227-
C622A7951E5C7F6500BB3D17 /* URLRequestConvertible.swift */,
228-
C62925AD1FC5900000607AEA /* URLRequestConvertible+Modifications.swift */,
230+
C622A7951E5C7F6500BB3D17 /* URLRequest+Init.swift */,
231+
C62925AD1FC5900000607AEA /* URLRequest+Modifications.swift */,
229232
C6F3A3FE211D665300BF0086 /* URL+StaticStringInit.swift */,
230233
);
231234
name = NetworkRequest;
@@ -251,26 +254,26 @@
251254
name = NetworkAccess;
252255
sourceTree = "<group>";
253256
};
254-
C6E5A4D51E2FBDDD00F966DB /* NetworkServiceTests */ = {
257+
C6E5A4D51E2FBDDD00F966DB /* NetworkService */ = {
255258
isa = PBXGroup;
256259
children = (
257260
C61E77881E49A57A00D55BB2 /* NetworkServiceMockTest.swift */,
258261
C61E778A1E49B53700D55BB2 /* RetryNetworkserviceTest.swift */,
259262
C60BE6A01D6B3807006B0364 /* NetworkServiceTest.swift */,
260263
C6C395951E0422AF00413AD2 /* ModifyRequestNetworkService.swift */,
261264
);
262-
name = NetworkServiceTests;
265+
name = NetworkService;
263266
sourceTree = "<group>";
264267
};
265-
C6E5A4D61E2FBE0000F966DB /* RessourceTests */ = {
268+
C6E5A4D61E2FBE0000F966DB /* Ressource */ = {
266269
isa = PBXGroup;
267270
children = (
268271
C65AA9A321187234007529BF /* ContainerNetworkTaskTest.swift */,
269272
C69188681EE688F700BAD320 /* DecodableResoureTest.swift */,
270273
C60425121D7803CA00FD3B38 /* ResourceTest.swift */,
271274
C66C7B971FE96EA8009B8C78 /* ResourceInspectTest.swift */,
272275
);
273-
name = RessourceTests;
276+
name = Ressource;
274277
sourceTree = "<group>";
275278
};
276279
/* End PBXGroup section */
@@ -349,7 +352,8 @@
349352
developmentRegion = English;
350353
hasScannedForEncodings = 0;
351354
knownRegions = (
352-
en,
355+
English,
356+
Base,
353357
);
354358
mainGroup = C60BE6511D6B2BF3006B0364;
355359
productRefGroup = C60BE65C1D6B2BF3006B0364 /* Products */;
@@ -392,7 +396,7 @@
392396
);
393397
runOnlyForDeploymentPostprocessing = 0;
394398
shellPath = /bin/sh;
395-
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
399+
shellScript = "if [ \\\"${CONFIGURATION}\\\" != \\\"Release\\\" ];\nthen if which swiftlint >/dev/null;\nthen\nswiftlint\nelse\necho \\\"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\\\"\nfi\nfi\n";
396400
};
397401
/* End PBXShellScriptBuildPhase section */
398402

@@ -401,10 +405,10 @@
401405
isa = PBXSourcesBuildPhase;
402406
buildActionMask = 2147483647;
403407
files = (
404-
C62925AE1FC5900000607AEA /* URLRequestConvertible+Modifications.swift in Sources */,
408+
C62925AE1FC5900000607AEA /* URLRequest+Modifications.swift in Sources */,
405409
C66C7B961FE96CD0009B8C78 /* Resource+Inspect.swift in Sources */,
406410
C6C395941E04212F00413AD2 /* ModifyRequestNetworkService.swift in Sources */,
407-
C622A7961E5C7F6500BB3D17 /* URLRequestConvertible.swift in Sources */,
411+
C622A7961E5C7F6500BB3D17 /* URLRequest+Init.swift in Sources */,
408412
C60BE6901D6B2C46006B0364 /* Resource.swift in Sources */,
409413
C6461F021E01678100E0B081 /* RetryNetworkService.swift in Sources */,
410414
C61E778C1E49D8A900D55BB2 /* NetworkTaskMock.swift in Sources */,
@@ -414,6 +418,7 @@
414418
C6F3A3FF211D665300BF0086 /* URL+StaticStringInit.swift in Sources */,
415419
C6F235D51D7DA75000E628D8 /* URLSession+NetworkAccess.swift in Sources */,
416420
C60BE68F1D6B2C46006B0364 /* HTTPMethod.swift in Sources */,
421+
C6576B6E21DDFD25009AC99C /* NetworkService+Result.swift in Sources */,
417422
C6E429721F70ECFF004121F1 /* URLSessionDataTask+NetworkTask.swift in Sources */,
418423
C65AA9A221185F68007529BF /* ContainerNetworkTask.swift in Sources */,
419424
C68FF1F51E1A64CB00A2513F /* Resource+Map.swift in Sources */,
@@ -444,7 +449,7 @@
444449
C6C395961E0422AF00413AD2 /* ModifyRequestNetworkService.swift in Sources */,
445450
C6F7E3101E49DCBA00FA625F /* NetworkTaskMockTests.swift in Sources */,
446451
C61E778B1E49B53700D55BB2 /* RetryNetworkserviceTest.swift in Sources */,
447-
C60FF0F31E5C94CD00818031 /* URLRequestConvertibleTest.swift in Sources */,
452+
C60FF0F31E5C94CD00818031 /* URLRequestTest.swift in Sources */,
448453
C6F3A402211D732C00BF0086 /* URL+StaticStringInitTest.swift in Sources */,
449454
C6363D911F4ED2030052E9BD /* DefaultMocks.swift in Sources */,
450455
);
@@ -515,7 +520,7 @@
515520
ONLY_ACTIVE_ARCH = YES;
516521
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
517522
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
518-
SWIFT_VERSION = 3.0;
523+
SWIFT_VERSION = 5.0;
519524
TARGETED_DEVICE_FAMILY = "1,2,3,4";
520525
TVOS_DEPLOYMENT_TARGET = 9.0;
521526
VERSIONING_SYSTEM = "apple-generic";
@@ -571,7 +576,7 @@
571576
MTL_ENABLE_DEBUG_INFO = NO;
572577
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
573578
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
574-
SWIFT_VERSION = 3.0;
579+
SWIFT_VERSION = 5.0;
575580
TARGETED_DEVICE_FAMILY = "1,2,3,4";
576581
TVOS_DEPLOYMENT_TARGET = 9.0;
577582
VALIDATE_PRODUCT = YES;
@@ -600,7 +605,6 @@
600605
PRODUCT_NAME = "$(TARGET_NAME)";
601606
SKIP_INSTALL = YES;
602607
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
603-
SWIFT_VERSION = 4.0;
604608
};
605609
name = Debug;
606610
};
@@ -622,7 +626,6 @@
622626
PRODUCT_BUNDLE_IDENTIFIER = com.dbsystel.DBNetworkStack;
623627
PRODUCT_NAME = "$(TARGET_NAME)";
624628
SKIP_INSTALL = YES;
625-
SWIFT_VERSION = 4.0;
626629
};
627630
name = Release;
628631
};
@@ -635,7 +638,6 @@
635638
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/../Frameworks";
636639
PRODUCT_BUNDLE_IDENTIFIER = com.dbsystel.DBNetworkStackTests;
637640
PRODUCT_NAME = "$(TARGET_NAME)";
638-
SWIFT_VERSION = 4.0;
639641
};
640642
name = Debug;
641643
};
@@ -648,7 +650,6 @@
648650
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/../Frameworks";
649651
PRODUCT_BUNDLE_IDENTIFIER = com.dbsystel.DBNetworkStackTests;
650652
PRODUCT_NAME = "$(TARGET_NAME)";
651-
SWIFT_VERSION = 4.0;
652653
};
653654
name = Release;
654655
};

0 commit comments

Comments
 (0)