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

Alamofire 5! #1810

Merged
merged 34 commits into from Aug 1, 2019
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a9ee2d6
Update Carthage dependencies for Alamofire 5
sunshinejr Feb 18, 2019
42015e7
Update min. targets to align with Alamofire 5
sunshinejr Feb 18, 2019
afc1309
Update .podspec to use Alamofire 5
sunshinejr Feb 18, 2019
0b4eeda
Remove PropertyListEncoding
sunshinejr Feb 18, 2019
dfa9bb5
SessionManager -> Session, manager -> session
sunshinejr Feb 18, 2019
bbeca2a
Removed MultipartFormDataEncodingResult
sunshinejr Feb 18, 2019
c5f45cb
Update DownloadDestination & Upload/download progress
sunshinejr Feb 18, 2019
8c133b0
Update multipart upload method
sunshinejr Feb 18, 2019
0656278
Update authentication method in RequestType
sunshinejr Feb 18, 2019
1cd8c0d
Align Rx/Reactive frameworks min dep target
sunshinejr Feb 19, 2019
1f43485
Add RequestInterceptor typealias
sunshinejr Feb 19, 2019
fbb92d7
SessionMock, manager -> session
sunshinejr Feb 19, 2019
64b4d9c
Add internal PropertyListEncoding to use in bad encoding
sunshinejr Feb 19, 2019
91db1d6
Update NetworkLoggerPluginSpec to new Alamofire
sunshinejr Feb 19, 2019
3882769
Create temporary RequestTypeWrapper
sunshinejr Feb 19, 2019
5a9e0b7
Update Carthage deps to Alamo 5 beta 3 and more
sunshinejr Mar 23, 2019
b44c3c4
Update Alamofire to beta.6
sunshinejr May 2, 2019
a466f50
Update codebase to Alamofire 5.0.0-beta.6
sunshinejr May 2, 2019
f836a41
Move RequestTypeWrapper to its own file
sunshinejr May 30, 2019
dd14a56
Remove unnecessary comment from PropertyListEncoding
sunshinejr May 30, 2019
651c21f
Merge branch 'development' into feature/alamofire_5
sunshinejr May 30, 2019
a50ee48
Cleanup some SwiftLint warnings
sunshinejr May 30, 2019
3a63042
Make Moya functional with Alamofire 5
sunshinejr Jul 4, 2019
8481140
Code cleanup in Alamofire 5 transition
sunshinejr Jul 4, 2019
4b5683f
Add Changelog entry for Alamofire 5
sunshinejr Jul 4, 2019
da7a1c4
Update Alamofire to 5.0.0-beta.6 on SPM
sunshinejr Jul 4, 2019
3749534
Update Changelog to use beta-6 of Alamofire for now
sunshinejr Jul 4, 2019
1636f7c
Add info about min. targets to Changelog
sunshinejr Jul 4, 2019
673e2e4
Fix pr link in Changelog Alamofire entries
sunshinejr Jul 5, 2019
f32dc83
Small code improvements to MoyaProvider+Internal
sunshinejr Jul 5, 2019
2509742
Some cleanup after the first CR round for Alamofire 5
sunshinejr Jul 28, 2019
3e2823d
Update Alamofire to version 5.0.0-beta.7
sunshinejr Jul 31, 2019
bdc830e
Use Alamofire's curlDescription for legacy debugDescription
sunshinejr Jul 31, 2019
c3ac3ac
Allow warnings in pod lib lint step
sunshinejr Aug 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
@@ -1,3 +1,3 @@
github "Alamofire/Alamofire" ~> 4.1
github "Alamofire/Alamofire" "5.0.0-beta.6"
github "ReactiveCocoa/ReactiveSwift" ~> 6.0
github "ReactiveX/RxSwift" ~> 5.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
@@ -1,4 +1,4 @@
github "Alamofire/Alamofire" "4.8.2"
github "Alamofire/Alamofire" "5.0.0-beta.6"
github "AliSoftware/OHHTTPStubs" "8.0.0"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.1.0"
Expand Down
2 changes: 2 additions & 0 deletions Changelog.md
@@ -1,6 +1,8 @@
# Next

### Changed
- **Breaking Change** Minimum target version are now in line with Alamofire 5. iOS: 10.0, tvOS: 10.0, macOS: 10.12. [#1810](https://github.com/Moya/Moya/pull/1810) by [@sunshinejr](https://github.com/sunshinejr).
- **Breaking Change** Minimum version of `Alamofire` is now 5.0.0-beta.6. [#1810](https://github.com/Moya/Moya/pull/1810) by [@sunshinejr](https://github.com/sunshinejr).
- **Breaking Change** Removed `Result` depndency in favor of `Result` introduced in Swift 5. [#1858](https://github.com/Moya/Moya/pull/1858) by [@larryonoff](https://github.com/larryonoff).

# [14.0.0-alpha.1] - 2019-05-14
Expand Down
8 changes: 4 additions & 4 deletions Moya.podspec
Expand Up @@ -13,9 +13,9 @@ Pod::Spec.new do |s|
s.license = { :type => "MIT", :file => "License.md" }
s.author = { "Ash Furrow" => "ash@ashfurrow.com" }
s.social_media_url = "http://twitter.com/ashfurrow"
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '3.0'
s.source = { :git => "https://github.com/Moya/Moya.git", :tag => s.version }
s.default_subspec = "Core"
Expand All @@ -24,7 +24,7 @@ Pod::Spec.new do |s|

s.subspec "Core" do |ss|
ss.source_files = "Sources/Moya/", "Sources/Moya/Plugins/"
ss.dependency "Alamofire", "~> 4.1"
ss.dependency "Alamofire", "5.0.0-beta.6"
ss.framework = "Foundation"
end

Expand Down
72 changes: 44 additions & 28 deletions Moya.xcodeproj/project.pbxproj
Expand Up @@ -61,6 +61,8 @@
7B147185DCE78CD98E28D3F2 /* Observable+Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8736BEE85376471D7CB1E0ED /* Observable+Response.swift */; };
7C32947EA657E981CB15D58C /* TestPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCACC7B19F3FFC2DEE74E07B /* TestPlugin.swift */; };
83B0E400A7562256224CB7FF /* AccessTokenPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC115388D44D0DB7A753E9BB /* AccessTokenPlugin.swift */; };
85B2DBBC221C69620098F59A /* PropertyListEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85B2DBBB221C69620098F59A /* PropertyListEncoding.swift */; };
85F6042E22A018BB00063320 /* RequestTypeWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F6042D22A018BB00063320 /* RequestTypeWrapper.swift */; };
8995DF740A59721AA79F5B43 /* MoyaProvider+ReactiveSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = C841AA621AEC61FAEA0CA019 /* MoyaProvider+ReactiveSpec.swift */; };
9854C1DBF14818CCA76AEC7F /* MoyaProvider+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225C397C03E17F7DFBCA2848 /* MoyaProvider+Internal.swift */; };
9A58B120B1293AFE556915AE /* MoyaProviderSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1F68927EA26EBDB45E82C8C /* MoyaProviderSpec.swift */; };
Expand Down Expand Up @@ -188,6 +190,8 @@
82E52DC541FD052ABA625D2A /* MoyaProviderIntegrationTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MoyaProviderIntegrationTests.swift; sourceTree = "<group>"; };
832781077A551E1F86E5F2D4 /* NetworkLoggerPluginSpec.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NetworkLoggerPluginSpec.swift; sourceTree = "<group>"; };
851FFE6DC58E873408D0E8E7 /* MoyaProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MoyaProvider.swift; sourceTree = "<group>"; };
85B2DBBB221C69620098F59A /* PropertyListEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PropertyListEncoding.swift; sourceTree = "<group>"; };
85F6042D22A018BB00063320 /* RequestTypeWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTypeWrapper.swift; sourceTree = "<group>"; };
86F3C0EA472C23E786E23CE9 /* Image.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = "<group>"; };
8736BEE85376471D7CB1E0ED /* Observable+Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "Observable+Response.swift"; sourceTree = "<group>"; };
884642F58B074C95261DCA86 /* CredentialsPlugin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CredentialsPlugin.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -292,6 +296,7 @@
F1AFAFEA29CDFABC559F0BE2 /* SignalProducer+MoyaSpec.swift */,
78A2D39A1F44D45100C9E122 /* Single+MoyaSpec.swift */,
4650771638DBA96BDE28F11B /* TestHelpers.swift */,
85B2DBBB221C69620098F59A /* PropertyListEncoding.swift */,
CA93F1BAD55FF95EDE17EE61 /* testImage.png */,
DCACC7B19F3FFC2DEE74E07B /* TestPlugin.swift */,
);
Expand Down Expand Up @@ -340,6 +345,7 @@
1446FBB21F214C5200C1EFF2 /* URL+Moya.swift */,
149749441F892E2F00FA4900 /* URLRequest+Encoding.swift */,
1F8AA0BB1FE0630300C9D7B6 /* ValidationType.swift */,
85F6042D22A018BB00063320 /* RequestTypeWrapper.swift */,
);
path = Moya;
sourceTree = "<group>";
Expand Down Expand Up @@ -814,6 +820,7 @@
files = (
1F8AA0BC1FE0630300C9D7B6 /* ValidationType.swift in Sources */,
3AF7063CBE1F9626FB32D933 /* Cancellable.swift in Sources */,
85F6042E22A018BB00063320 /* RequestTypeWrapper.swift in Sources */,
49C61E884A595E94758B5643 /* Endpoint.swift in Sources */,
FB223B5C3B7D4AA5261E25EA /* Image.swift in Sources */,
EDBA10DB0D0E35C1474AAB4D /* Moya+Alamofire.swift in Sources */,
Expand Down Expand Up @@ -889,6 +896,7 @@
78A2D3991F44BACD00C9E122 /* RxTestHelpers.swift in Sources */,
53376123902C6A22A44DB88E /* Error+MoyaSpec.swift in Sources */,
78A2D39B1F44D45100C9E122 /* Single+MoyaSpec.swift in Sources */,
85B2DBBC221C69620098F59A /* PropertyListEncoding.swift in Sources */,
C1B5E2325B210232599B0D1A /* ErrorTests.swift in Sources */,
539FD70730B00973E1778CD3 /* MethodSpec.swift in Sources */,
B4ABD55950B0E70BF44E79C6 /* MoyaProviderIntegrationTests.swift in Sources */,
Expand Down Expand Up @@ -962,17 +970,17 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.Moya;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 3.0;
Expand Down Expand Up @@ -1011,9 +1019,9 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.RxMoya;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1022,7 +1030,7 @@
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 3.0;
Expand Down Expand Up @@ -1055,18 +1063,18 @@
);
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.MoyaTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Debug;
Expand Down Expand Up @@ -1115,11 +1123,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4";
TVOS_DEPLOYMENT_TARGET = 10.0;
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Release;
};
Expand Down Expand Up @@ -1155,17 +1167,17 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.RxMoya;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 3.0;
Expand Down Expand Up @@ -1199,7 +1211,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Examples/Basic/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = Moya.Basic;
Expand Down Expand Up @@ -1240,7 +1252,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Examples/Basic/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = Moya.Basic;
Expand Down Expand Up @@ -1278,7 +1290,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "Examples/Multi-Target/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "Moya.Multi-Target";
Expand Down Expand Up @@ -1319,7 +1331,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "Examples/Multi-Target/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "Moya.Multi-Target";
Expand Down Expand Up @@ -1362,9 +1374,9 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.ReactiveMoya;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1373,7 +1385,7 @@
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 3.0;
Expand Down Expand Up @@ -1431,11 +1443,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4";
TVOS_DEPLOYMENT_TARGET = 10.0;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Debug;
};
Expand Down Expand Up @@ -1471,9 +1487,9 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.Moya;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1482,7 +1498,7 @@
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 3.0;
Expand Down Expand Up @@ -1513,17 +1529,17 @@
);
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.MoyaTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Release;
Expand Down Expand Up @@ -1560,17 +1576,17 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.ReactiveMoya;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TVOS_DEPLOYMENT_TARGET = 9.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 3.0;
Expand Down
12 changes: 6 additions & 6 deletions Package.resolved
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/Alamofire/Alamofire.git",
"state": {
"branch": null,
"revision": "75bba56748359f297a83f620d45f72cf4ebee4e7",
"version": "4.8.2"
"revision": "163db02519e6f89dcbc57126bd5b17f729b81988",
"version": "5.0.0-beta.6"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "43304bf2b1579fd555f2fdd51742771c1e4f2b98",
"version": "8.0.1"
"revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
"version": "8.0.2"
}
},
{
Expand All @@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
"state": {
"branch": null,
"revision": "3eba2b48ee80f87058de5ae8bb41e585bde5c997",
"version": "6.0.0"
"revision": "b772fa0b624926e6e2f21acbb79297736a05c585",
"version": "6.1.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Expand Up @@ -9,7 +9,7 @@ let package = Package(
.library(name: "RxMoya", targets: ["RxMoya"])
],
dependencies: [
.package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "4.1.0")),
.package(url: "https://github.com/Alamofire/Alamofire.git", .exact("5.0.0-beta.6")),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("6.0.0"))),
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0"))
],
Expand Down