Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Alamofire/Alamofire
Browse files Browse the repository at this point in the history
* 'master' of github.com:Alamofire/Alamofire: (27 commits)
  [PR Alamofire#1721] Improve embedded framework installation instructions.
  [PR Alamofire#1722] Update README for proper error checking in download.
  [Issue Alamofire#1672] Added Request retryCount property to support RequestRetrier.
  Fixed test target compiler warning by not requiring app extension APIs only.
  [PR Alamofire#1670] Fixed compiler issue with DownloadRequest in AF4 migration guide.
  SPM package file now excludes tests since current configuration is not supported.
  Pulled in the release notes for the 3.5.1 release into the CHANGELOG.
  Added docstrings and note to README about resumeData and background sessions.
  Add 10.12 check for tests results, as macOS results are now correct.
  Added missing dashes in CHANGELOG…no functional changes.
  [PR Alamofire#1633] Fixed sample code in the README where error was used incorrectly.
  [PR Alamofire#1625] Fixed Session Manager internal links in the README.
  [PR Alamofire#1615] Fixed compiler error in response validation sample code in README.
  Added release notes to the CHANGELOG and bumped the version to 4.0.1.
  Removed excess whitespace from some of the docstrings…no functional changes.
  Removed framework and test target overrides that duplicated project settings.
  [PR Alamofire#1612] Fixed compilation issue in response handler section of the README.
  Fixed up if statement formatting…no functional changes.
  Added test verifying download request can be resumed with resume data.
  [Issue Alamofire#1551] Fixed retain cycle when using Validation clsoures.
  ...
  • Loading branch information
bdonkey committed Oct 31, 2016
2 parents 679e84d + c71f503 commit 53f9d13
Show file tree
Hide file tree
Showing 26 changed files with 275 additions and 117 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ env:
- LANG=en_US.UTF-8
- WORKSPACE=Alamofire.xcworkspace
- IOS_FRAMEWORK_SCHEME="Alamofire iOS"
- OSX_FRAMEWORK_SCHEME="Alamofire OSX"
- MACOS_FRAMEWORK_SCHEME="Alamofire macOS"
- TVOS_FRAMEWORK_SCHEME="Alamofire tvOS"
- WATCHOS_FRAMEWORK_SCHEME="Alamofire watchOS"
- IOS_SDK=iphonesimulator10.0
- OSX_SDK=macosx10.12
- MACOS_SDK=macosx10.12
- TVOS_SDK=appletvsimulator10.0
- WATCHOS_SDK=watchsimulator3.0
- EXAMPLE_SCHEME="iOS Example"
Expand All @@ -24,7 +24,7 @@ env:
- DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
- DESTINATION="OS=9.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"

- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$OSX_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
before_install:
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
script:
Expand All @@ -34,21 +34,21 @@ script:

# Build Framework in Debug and Run Tests if specified
- if [ $RUN_TESTS == "YES" ]; then
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
else
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
fi

# Build Framework in Release and Run Tests if specified
- if [ $RUN_TESTS == "YES" ]; then
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
else
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
fi

# Build Example in Debug if specified
- if [ $BUILD_EXAMPLE == "YES" ]; then
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
fi

# Run `pod lib lint` if specified
Expand Down
2 changes: 1 addition & 1 deletion Alamofire.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Alamofire'
s.version = '4.0.0'
s.version = '4.0.1'
s.license = 'MIT'
s.summary = 'Elegant HTTP Networking in Swift'
s.homepage = 'https://github.com/Alamofire/Alamofire'
Expand Down
Loading

0 comments on commit 53f9d13

Please sign in to comment.