Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift4.2 #73

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: objective-c
osx_image: xcode9
xcode_sdk: iphonesimulator10.0
env:
- PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone SE,OS=10.0"
osx_image: xcode10
xcode_sdk: iphonesimulator12.0
script:
- set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme $SCHEME -destination "$DESTINATION" build-for-testing test | xcpretty
- set -o pipefail
- travis_retry xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme "AlamofireSwiftyJSON" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty
2 changes: 1 addition & 1 deletion Alamofire
Submodule Alamofire updated 223 files
6 changes: 3 additions & 3 deletions Alamofire-SwiftyJSON.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Alamofire-SwiftyJSON"
s.version = "3.0.0"
s.version = "3.1.0"
s.summary = "Alamofire extension for serialize NSData to SwiftyJSON "
s.homepage = "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON"
s.license = { :type => "MIT" }
Expand All @@ -11,6 +11,6 @@ Pod::Spec.new do |s|
s.ios.deployment_target = "9.0"
s.source = { :git => "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git", :tag => s.version }
s.source_files = "Source/*.swift"
s.dependency 'Alamofire', '~> 4.5'
s.dependency 'SwiftyJSON', '~> 4.0.0'
s.dependency 'Alamofire', '~> 4.7.3'
s.dependency 'SwiftyJSON', '~> 4.2.0'
end
7 changes: 4 additions & 3 deletions Alamofire-SwiftyJSON.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = A8AFB70519D1401D0070765E;
Expand Down Expand Up @@ -430,7 +431,7 @@
4BC5EA061BB7E15600A393DD /* SwiftyJSON OSX Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftyJSON OSX Tests.xctest";
path = "SwiftyJSON macOS Tests.xctest";
remoteRef = 4BC5EA051BB7E15600A393DD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand Down Expand Up @@ -713,7 +714,7 @@
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand All @@ -724,7 +725,7 @@
isa = XCBuildConfiguration;
buildSettings = {
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand Down
2 changes: 1 addition & 1 deletion SwiftyJSON
Submodule SwiftyJSON updated 39 files
+2 −0 .hound.yml
+0 −1 .swift-version
+4 −4 .travis.yml
+10 −4 Example/Example.xcodeproj/project.pbxproj
+1 −1 Example/Example/AppDelegate.swift
+1 −1 Example/Example/ViewController.swift
+376 −59 Example/Playground.playground/Contents.swift
+81 −73 README.md
+0 −0 Source/Info-macOS.plist
+145 −72 Source/SwiftyJSON.swift
+3 −2 SwiftyJSON.podspec
+83 −56 SwiftyJSON.xcodeproj/project.pbxproj
+1 −3 SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON iOS.xcscheme
+9 −11 SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON macOS.xcscheme
+1 −3 SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON tvOS.xcscheme
+1 −3 SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON watchOS.xcscheme
+8 −0 SwiftyJSON.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+0 −0 Tests/ArrayTests.swift
+2 −2 Tests/BaseTests.swift
+104 −0 Tests/CodableTests.swift
+12 −12 Tests/ComparableTests.swift
+3 −3 Tests/DictionaryTests.swift
+0 −0 Tests/Info-iOS.plist
+0 −0 Tests/Info-macOS.plist
+0 −0 Tests/Info-tvOS.plist
+0 −0 Tests/LiteralConvertibleTests.swift
+0 −1 Tests/MergeTests.swift
+10 −2 Tests/MutabilityTests.swift
+1 −1 Tests/NestedJSONTests.swift
+2 −3 Tests/NumberTests.swift
+3 −3 Tests/PerformanceTests.swift
+1 −1 Tests/PrintableTests.swift
+3 −1 Tests/RawRepresentableTests.swift
+1 −5 Tests/RawTests.swift
+7 −7 Tests/SequenceTypeTests.swift
+11 −1 Tests/StringTests.swift
+2 −2 Tests/SubscriptTests.swift
+0 −0 Tests/Tes/Tests.json
+0 −2 scripts/carthage.sh