Skip to content

Commit

Permalink
Release 1.19.0 (#1538)
Browse files Browse the repository at this point in the history
* Updates change log

* Give tests more time to complete

* Add travis_wait to bundle install

* Let travis handle bundle install

This should make bundle install hit the cache

* Search and replace ftw

* Removes misleading text from README

* Updates README for version number update on modern macOS, simplifies version storage

* Trying to override install phase using travis_wait

* Restores original install commands

* Skip bundle install for deployment and pods

* move carthage to travis

* use rake for carthage

* add back bundle install to have consistancy acrros CI's

* Trigger rebuild for codecov

* Fix caching in travis

Fix caching by making sure bundler 2 is installed

* travis: cache specific directory

* fix path

* check if cache is working

* move facebook_utils twitter_utils to travis for faster overall build

* clean up circle

* move docs to last

* move parseui to travis to shrink overall build time

* use cache for parseui in travis

Co-authored-by: Corey's iMac <coreyearleon@icloud.com>
  • Loading branch information
drdaz and cbaker6 authored Sep 6, 2020
1 parent d83677d commit 931684b
Show file tree
Hide file tree
Showing 26 changed files with 101 additions and 126 deletions.
36 changes: 0 additions & 36 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,39 +57,6 @@ jobs:
- store_artifacts:
path: build/reports
destination: test_results
facebook_utils:
<<: *defaults
steps:
- checkout
- restore_cache: *cache-pull
- run: *prepare
- save_cache: *cache-push
- run: bundle exec rake test:facebook_utils:ios
- run: bash <(curl -s https://codecov.io/bash)
- store_test_results:
path: build/reports
twitter_utils:
<<: *defaults
steps:
- checkout
- restore_cache: *cache-pull
- run: *prepare
- save_cache: *cache-push
- run: bundle exec rake test:twitter_utils:ios
- run: bash <(curl -s https://codecov.io/bash)
- store_test_results:
path: build/reports
parseui:
<<: *defaults
steps:
- checkout
- restore_cache: *cache-pull
- run: *prepare
- save_cache: *cache-push
- run: bundle exec rake test:parseui:all
- run: bash <(curl -s https://codecov.io/bash)
- store_test_results:
path: build/reports
carthage:
<<: *defaults
steps:
Expand All @@ -105,9 +72,6 @@ workflows:
jobs:
- ios
- macos
- facebook_utils
- twitter_utils
- parseui
- carthage:
requires:
- ios
Expand Down
59 changes: 44 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ branches:
- master
- /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/
cache:
- bundle
directories:
- vendor/bundle

jobs:
include:
- stage: release
env: Deployment
install:
- bundle config set path 'vendor/bundle'
- bundle install
- travis_wait bundle install
script:
- bundle exec rake package:release
deploy:
Expand All @@ -28,27 +29,39 @@ jobs:
tags: true
all_branches: true
- stage: release
env: Docs
env: Facebook_Utils
install:
- bundle config set path 'vendor/bundle'
- bundle install
- travis_wait bundle install
script:
- ./Scripts/jazzy.sh
deploy:
- provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
local_dir: ./docs/
on:
all_branches: true
tags: true
- bundle exec rake test:facebook_utils:ios
after_script:
- bash <(curl -s https://codecov.io/bash)
- stage: release
env: Twitter_Utils
install:
- bundle config set path 'vendor/bundle'
- travis_wait bundle install
script:
- bundle exec rake test:twitter_utils:ios
after_script:
- bash <(curl -s https://codecov.io/bash)
- stage: release
env: ParseUI
install:
- bundle config set path 'vendor/bundle'
- travis_wait bundle install
script:
- bundle exec rake test:parseui:all
after_script:
- bash <(curl -s https://codecov.io/bash)
- stage: release
env: Cocoapods
install:
- bundle config set path 'vendor/bundle'
- bundle install
- bundle exec pod setup
- travis_wait bundle install
script:
- bundle exec pod setup
- travis_wait bundle exec pod lib lint --allow-warnings
deploy:
- provider: script
Expand All @@ -57,3 +70,19 @@ jobs:
on:
tags: true
all_branches: true
- stage: release
env: Docs
install:
- bundle config set path 'vendor/bundle'
- travis_wait bundle install
script:
- ./Scripts/jazzy.sh
deploy:
- provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
local_dir: ./docs/
on:
all_branches: true
tags: true

16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Parse-SDK-iOS-OSX Changelog

### master
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.18.0...master)
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.19.0...master)
* _Contributing to this repo? Add info about your change here to be included in next release_

### 1.19.0
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.18.0...1.19.0)

__New features__
- Added Sign In With Apple support to ParseUI [#1475](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1475), thanks to [Darren Black](https://github.com/drdaz). Transparent icons thanks to [Donald Ness](https://github.com/programmarchy)

__Improvements__
- Updated Facebook SDK to 6.x [#1504](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1504), thanks to [Markus Winkler](https://github.com/markuswinkler)

__Fixes__
- Removes deprecated UIWebView usage [#1511](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1511), thanks to [Nathan Kellert](https://github.com/parse-community/Parse-SDK-iOS-OSX/commits?author=noobs2ninjas)
- Fixes building with Xcode 12 [#1527](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1527), thanks to [Steffen Matthischke](https://github.com/HeEAaD)


### 1.18.0
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...1.18.0)

Expand Down
2 changes: 1 addition & 1 deletion Parse.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Parse'
s.version = '1.18.0'
s.version = '1.19.0'
s.license = { :type => 'BSD', :file => 'LICENSE' }
s.homepage = 'http://parseplatform.org/'
s.summary = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'
Expand Down
24 changes: 0 additions & 24 deletions Parse/Parse.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8966,7 +8966,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 1.18.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand All @@ -8975,7 +8974,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 1.18.0;
SWIFT_VERSION = 5.0;
};
name = Release;
Expand All @@ -8984,17 +8982,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 1.18.0;
MARKETING_VERSION = 1.18.0;
};
name = Debug;
};
815F24141BD04D150054659F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 1.18.0;
MARKETING_VERSION = 1.18.0;
};
name = Release;
};
Expand Down Expand Up @@ -9045,15 +9039,13 @@
baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
DEFINES_MODULE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.18.0;
SUPPORTS_MACCATALYST = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -9066,15 +9058,13 @@
baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
DEFINES_MODULE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.18.0;
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -9086,8 +9076,6 @@
baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
buildSettings = {
CLANG_MODULES_AUTOLINK = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
MARKETING_VERSION = 1.18.0;
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -9098,8 +9086,6 @@
baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
buildSettings = {
CLANG_MODULES_AUTOLINK = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
MARKETING_VERSION = 1.18.0;
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -9110,8 +9096,6 @@
baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
buildSettings = {
CLANG_MODULES_AUTOLINK = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
MARKETING_VERSION = 1.18.0;
};
name = Debug;
};
Expand All @@ -9120,8 +9104,6 @@
baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
buildSettings = {
CLANG_MODULES_AUTOLINK = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
MARKETING_VERSION = 1.18.0;
};
name = Release;
};
Expand All @@ -9130,7 +9112,6 @@
baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
buildSettings = {
CLANG_MODULES_AUTOLINK = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
};
name = Debug;
};
Expand All @@ -9139,27 +9120,22 @@
baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
buildSettings = {
CLANG_MODULES_AUTOLINK = YES;
CURRENT_PROJECT_VERSION = 1.18.0;
};
name = Release;
};
97010FB51630B18F00AB761E /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 1.18.0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 1.18.0;
};
name = Debug;
};
97010FB61630B18F00AB761E /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 1.18.0;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 1.18.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Parse/Parse/PFConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma mark - SDK Version
///--------------------------------------

#define PARSE_VERSION @"1.18.0"
#define PARSE_VERSION @"1.19.0"

///--------------------------------------
#pragma mark - Platform
Expand Down
4 changes: 2 additions & 2 deletions Parse/Parse/Resources/Parse-OSX.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>1.19.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>1.19.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Parse/Parse/Resources/Parse-iOS.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>1.19.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>1.19.0</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Parse/Parse/Resources/Parse-tvOS.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>1.19.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>1.19.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Parse/Parse/Resources/Parse-watchOS.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.18.0</string>
<string>1.19.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>1.19.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Parse/Tests/Other/TestCases/TestCase/PFTestCase.m
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ - (XCTestExpectation *)currentSelectorTestExpectation {
}

- (void)waitForTestExpectations {
[self waitForExpectationsWithTimeout:15.0 handler:nil];
[self waitForExpectationsWithTimeout:25.0 handler:nil];
}

///--------------------------------------
Expand Down
Loading

0 comments on commit 931684b

Please sign in to comment.