Skip to content

Commit 0ed7784

Browse files
committed
Not committed in a while, oops!
1 parent 3110d44 commit 0ed7784

File tree

1,945 files changed

+289261
-66443
lines changed

Some content is hidden

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

1,945 files changed

+289261
-66443
lines changed

Cartfile

+5
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ github "ReactiveCocoa/ReactiveCocoa"
22
github "Moya/Moya"
33
github "mdiep/MDPSplitView"
44
github "SwiftyJSON/SwiftyJSON"
5+
github "Hearst-DD/ObjectMapper"
6+
github "SnapKit/SnapKit"
7+
github "indragiek/CocoaMarkdown" "master"
8+
github "robbiehanson/CocoaAsyncSocket"
9+
github "DenHeadless/ClosureKit"

Cartfile.resolved

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
github "Alamofire/Alamofire" "3.3.0"
1+
github "Alamofire/Alamofire" "3.4.0"
2+
github "DenHeadless/ClosureKit" "0.3.0"
3+
github "robbiehanson/CocoaAsyncSocket" "7.4.3"
4+
github "indragiek/CocoaMarkdown" "3c818c648dce1f961f8cc4749c9801f660c1df8e"
25
github "mdiep/MDPSplitView" "1.0.2"
3-
github "antitypical/Result" "1.0.2"
4-
github "ReactiveX/RxSwift" "2.3.1"
6+
github "Hearst-DD/ObjectMapper" "1.2.0"
7+
github "antitypical/Result" "2.0.0"
8+
github "ReactiveX/RxSwift" "2.4"
9+
github "SnapKit/SnapKit" "0.20.0"
510
github "SwiftyJSON/SwiftyJSON" "2.3.3"
6-
github "ReactiveCocoa/ReactiveCocoa" "v4.0.1"
7-
github "Moya/Moya" "6.3.0"
11+
github "ReactiveCocoa/ReactiveCocoa" "v4.1.0"
12+
github "Moya/Moya" "6.4.0"

Carthage/Build/Mac/Alamofire.framework.dSYM/Contents/Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.

Carthage/Build/Mac/Alamofire.framework/Versions/A/Headers/Alamofire-Swift.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Carthage/Build/Mac/Alamofire.framework/Versions/A/Headers/Alamofire.h

+19-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Carthage/Build/Mac/Alamofire.framework/Versions/A/Resources/Info.plist

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Build/Mac/MDPSplitView.framework/Versions/A/Resources/Info.plist

+6-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Build/Mac/Moya.framework/Versions/A/Headers/Moya-Swift.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
576 Bytes
Binary file not shown.

Carthage/Build/Mac/Moya.framework/Versions/A/Resources/Info.plist

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Build/Mac/ReactiveCocoa.framework/Versions/A/Resources/Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Build/Mac/ReactiveMoya.framework/Versions/A/Headers/ReactiveMoya-Swift.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Build/Mac/ReactiveMoya.framework/Versions/A/Resources/Info.plist

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Carthage/Build/Mac/Result.framework.dSYM/Contents/Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Build/Mac/Result.framework/Versions/A/Resources/Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.

Carthage/Build/Mac/SwiftyJSON.framework/Versions/A/Headers/SwiftyJSON-Swift.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Carthage/Build/Mac/SwiftyJSON.framework/Versions/A/Resources/Info.plist

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Carthage/Checkouts/Alamofire/.travis.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
- DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
2121
- DESTINATION="OS=8.4,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
2222
- DESTINATION="OS=9.0,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
23-
- DESTINATION="OS=9.1,name=iPhone Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
23+
- DESTINATION="OS=9.1,name=iPhone 6 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
2424
- DESTINATION="OS=9.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
2525
- DESTINATION="OS=9.3,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
2626
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$OSX_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
@@ -50,11 +50,6 @@ script:
5050
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
5151
fi
5252

53-
# Build Example in Release if specified
54-
- if [ $BUILD_EXAMPLE == "YES" ]; then
55-
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
56-
fi
57-
5853
# Run `pod lib lint` if specified
5954
- if [ $POD_LINT == "YES" ]; then
6055
pod lib lint;

Carthage/Checkouts/Alamofire/Alamofire.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Alamofire'
3-
s.version = '3.3.0'
3+
s.version = '3.4.0'
44
s.license = 'MIT'
55
s.summary = 'Elegant HTTP Networking in Swift'
66
s.homepage = 'https://github.com/Alamofire/Alamofire'

Carthage/Checkouts/Alamofire/Alamofire.xcodeproj/project.pbxproj

+12-1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@
117117
4C83F41B1B749E0E00203445 /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C83F41A1B749E0E00203445 /* Stream.swift */; };
118118
4C83F41C1B749E0E00203445 /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C83F41A1B749E0E00203445 /* Stream.swift */; };
119119
4C83F41D1B749E0E00203445 /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C83F41A1B749E0E00203445 /* Stream.swift */; };
120+
4C9DCE781CB1BCE2003E6463 /* SessionDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9DCE771CB1BCE2003E6463 /* SessionDelegateTests.swift */; };
121+
4C9DCE791CB1BCE2003E6463 /* SessionDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9DCE771CB1BCE2003E6463 /* SessionDelegateTests.swift */; };
122+
4C9DCE7A1CB1BCE2003E6463 /* SessionDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9DCE771CB1BCE2003E6463 /* SessionDelegateTests.swift */; };
120123
4CA028C51B7466C500C84163 /* ResultTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA028C41B7466C500C84163 /* ResultTests.swift */; };
121124
4CA028C61B7466C500C84163 /* ResultTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA028C41B7466C500C84163 /* ResultTests.swift */; };
122125
4CB928291C66BFBC00CE5F08 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB928281C66BFBC00CE5F08 /* Notifications.swift */; };
@@ -272,6 +275,7 @@
272275
4C812C5F1B535F6D0017E0BF /* root-ca-disig.cer */ = {isa = PBXFileReference; lastKnownFileType = file; name = "root-ca-disig.cer"; path = "disig.sk/root-ca-disig.cer"; sourceTree = "<group>"; };
273276
4C812C601B535F6D0017E0BF /* testssl-expire.disig.sk.cer */ = {isa = PBXFileReference; lastKnownFileType = file; name = "testssl-expire.disig.sk.cer"; path = "disig.sk/testssl-expire.disig.sk.cer"; sourceTree = "<group>"; };
274277
4C83F41A1B749E0E00203445 /* Stream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stream.swift; sourceTree = "<group>"; };
278+
4C9DCE771CB1BCE2003E6463 /* SessionDelegateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionDelegateTests.swift; sourceTree = "<group>"; };
275279
4CA028C41B7466C500C84163 /* ResultTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResultTests.swift; sourceTree = "<group>"; };
276280
4CB928281C66BFBC00CE5F08 /* Notifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
277281
4CCFA7991B2BE71600B6F460 /* URLProtocolTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLProtocolTests.swift; sourceTree = "<group>"; };
@@ -377,6 +381,7 @@
377381
F8111E5D19A9674D0040E7D1 /* RequestTests.swift */,
378382
F8111E5E19A9674D0040E7D1 /* ResponseTests.swift */,
379383
4CA028C41B7466C500C84163 /* ResultTests.swift */,
384+
4C9DCE771CB1BCE2003E6463 /* SessionDelegateTests.swift */,
380385
);
381386
name = Core;
382387
sourceTree = "<group>";
@@ -410,9 +415,9 @@
410415
4C33A1171B5207DB00873DFF /* Certificates */ = {
411416
isa = PBXGroup;
412417
children = (
413-
B39E2F821C1A72E5002DA1A9 /* Varying Encoding Types and Extensions */,
414418
4C812C391B535F060017E0BF /* alamofire.org */,
415419
4C812C381B535F000017E0BF /* disig.sk */,
420+
B39E2F821C1A72E5002DA1A9 /* Varying Encoding Types and Extensions */,
416421
);
417422
name = Certificates;
418423
path = Resources/Certificates;
@@ -557,7 +562,10 @@
557562
F8111E3F19A95C8B0040E7D1 /* Tests */,
558563
F8111E3419A95C8B0040E7D1 /* Products */,
559564
);
565+
indentWidth = 4;
560566
sourceTree = "<group>";
567+
tabWidth = 4;
568+
usesTabs = 0;
561569
};
562570
F8111E3419A95C8B0040E7D1 /* Products */ = {
563571
isa = PBXGroup;
@@ -989,6 +997,7 @@
989997
4CF627181BA7CC240011A099 /* RequestTests.swift in Sources */,
990998
4CF627211BA7CC240011A099 /* TLSEvaluationTests.swift in Sources */,
991999
4CF627221BA7CC240011A099 /* UploadTests.swift in Sources */,
1000+
4C9DCE7A1CB1BCE2003E6463 /* SessionDelegateTests.swift in Sources */,
9921001
4C80F9F91BB730F6001B46D2 /* String+AlamofireTests.swift in Sources */,
9931002
4CF6271E1BA7CC240011A099 /* MultipartFormDataTests.swift in Sources */,
9941003
4CF627201BA7CC240011A099 /* ServerTrustPolicyTests.swift in Sources */,
@@ -1087,6 +1096,7 @@
10871096
4C3238E71B3604DB00FE04AE /* MultipartFormDataTests.swift in Sources */,
10881097
4C33A1431B52089C00873DFF /* ServerTrustPolicyTests.swift in Sources */,
10891098
4C341BBA1B1A865A00C1B34D /* CacheTests.swift in Sources */,
1099+
4C9DCE781CB1BCE2003E6463 /* SessionDelegateTests.swift in Sources */,
10901100
4C4CBE7B1BAF700C0024D659 /* String+AlamofireTests.swift in Sources */,
10911101
4CA028C51B7466C500C84163 /* ResultTests.swift in Sources */,
10921102
4CCFA79A1B2BE71600B6F460 /* URLProtocolTests.swift in Sources */,
@@ -1113,6 +1123,7 @@
11131123
4C3238E81B3604DB00FE04AE /* MultipartFormDataTests.swift in Sources */,
11141124
4C33A1441B52089C00873DFF /* ServerTrustPolicyTests.swift in Sources */,
11151125
4C341BBB1B1A865A00C1B34D /* CacheTests.swift in Sources */,
1126+
4C9DCE791CB1BCE2003E6463 /* SessionDelegateTests.swift in Sources */,
11161127
4C4CBE7C1BAF700C0024D659 /* String+AlamofireTests.swift in Sources */,
11171128
4CA028C61B7466C500C84163 /* ResultTests.swift in Sources */,
11181129
4CCFA79B1B2BE71600B6F460 /* URLProtocolTests.swift in Sources */,

0 commit comments

Comments
 (0)