Skip to content

Commit 931684b

Browse files
drdazcbaker6
andauthored
Release 1.19.0 (#1538)
* 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 <[email protected]>
1 parent d83677d commit 931684b

File tree

26 files changed

+101
-126
lines changed

26 files changed

+101
-126
lines changed

.circleci/config.yml

-36
Original file line numberDiff line numberDiff line change
@@ -57,39 +57,6 @@ jobs:
5757
- store_artifacts:
5858
path: build/reports
5959
destination: test_results
60-
facebook_utils:
61-
<<: *defaults
62-
steps:
63-
- checkout
64-
- restore_cache: *cache-pull
65-
- run: *prepare
66-
- save_cache: *cache-push
67-
- run: bundle exec rake test:facebook_utils:ios
68-
- run: bash <(curl -s https://codecov.io/bash)
69-
- store_test_results:
70-
path: build/reports
71-
twitter_utils:
72-
<<: *defaults
73-
steps:
74-
- checkout
75-
- restore_cache: *cache-pull
76-
- run: *prepare
77-
- save_cache: *cache-push
78-
- run: bundle exec rake test:twitter_utils:ios
79-
- run: bash <(curl -s https://codecov.io/bash)
80-
- store_test_results:
81-
path: build/reports
82-
parseui:
83-
<<: *defaults
84-
steps:
85-
- checkout
86-
- restore_cache: *cache-pull
87-
- run: *prepare
88-
- save_cache: *cache-push
89-
- run: bundle exec rake test:parseui:all
90-
- run: bash <(curl -s https://codecov.io/bash)
91-
- store_test_results:
92-
path: build/reports
9360
carthage:
9461
<<: *defaults
9562
steps:
@@ -105,9 +72,6 @@ workflows:
10572
jobs:
10673
- ios
10774
- macos
108-
- facebook_utils
109-
- twitter_utils
110-
- parseui
11175
- carthage:
11276
requires:
11377
- ios

.travis.yml

+44-15
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ branches:
66
- master
77
- /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/
88
cache:
9-
- bundle
9+
directories:
10+
- vendor/bundle
1011

1112
jobs:
1213
include:
1314
- stage: release
1415
env: Deployment
1516
install:
1617
- bundle config set path 'vendor/bundle'
17-
- bundle install
18+
- travis_wait bundle install
1819
script:
1920
- bundle exec rake package:release
2021
deploy:
@@ -28,27 +29,39 @@ jobs:
2829
tags: true
2930
all_branches: true
3031
- stage: release
31-
env: Docs
32+
env: Facebook_Utils
3233
install:
3334
- bundle config set path 'vendor/bundle'
34-
- bundle install
35+
- travis_wait bundle install
3536
script:
36-
- ./Scripts/jazzy.sh
37-
deploy:
38-
- provider: pages
39-
skip_cleanup: true
40-
github_token: $GITHUB_TOKEN
41-
local_dir: ./docs/
42-
on:
43-
all_branches: true
44-
tags: true
37+
- bundle exec rake test:facebook_utils:ios
38+
after_script:
39+
- bash <(curl -s https://codecov.io/bash)
40+
- stage: release
41+
env: Twitter_Utils
42+
install:
43+
- bundle config set path 'vendor/bundle'
44+
- travis_wait bundle install
45+
script:
46+
- bundle exec rake test:twitter_utils:ios
47+
after_script:
48+
- bash <(curl -s https://codecov.io/bash)
49+
- stage: release
50+
env: ParseUI
51+
install:
52+
- bundle config set path 'vendor/bundle'
53+
- travis_wait bundle install
54+
script:
55+
- bundle exec rake test:parseui:all
56+
after_script:
57+
- bash <(curl -s https://codecov.io/bash)
4558
- stage: release
4659
env: Cocoapods
4760
install:
4861
- bundle config set path 'vendor/bundle'
49-
- bundle install
50-
- bundle exec pod setup
62+
- travis_wait bundle install
5163
script:
64+
- bundle exec pod setup
5265
- travis_wait bundle exec pod lib lint --allow-warnings
5366
deploy:
5467
- provider: script
@@ -57,3 +70,19 @@ jobs:
5770
on:
5871
tags: true
5972
all_branches: true
73+
- stage: release
74+
env: Docs
75+
install:
76+
- bundle config set path 'vendor/bundle'
77+
- travis_wait bundle install
78+
script:
79+
- ./Scripts/jazzy.sh
80+
deploy:
81+
- provider: pages
82+
skip_cleanup: true
83+
github_token: $GITHUB_TOKEN
84+
local_dir: ./docs/
85+
on:
86+
all_branches: true
87+
tags: true
88+

CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
# Parse-SDK-iOS-OSX Changelog
22

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

7+
### 1.19.0
8+
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.18.0...1.19.0)
9+
10+
__New features__
11+
- 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)
12+
13+
__Improvements__
14+
- 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)
15+
16+
__Fixes__
17+
- 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)
18+
- 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)
19+
20+
721
### 1.18.0
822
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...1.18.0)
923

Parse.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Parse'
3-
s.version = '1.18.0'
3+
s.version = '1.19.0'
44
s.license = { :type => 'BSD', :file => 'LICENSE' }
55
s.homepage = 'http://parseplatform.org/'
66
s.summary = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

Parse/Parse.xcodeproj/project.pbxproj

-24
Original file line numberDiff line numberDiff line change
@@ -8966,7 +8966,6 @@
89668966
isa = XCBuildConfiguration;
89678967
baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */;
89688968
buildSettings = {
8969-
CURRENT_PROJECT_VERSION = 1.18.0;
89708969
SWIFT_VERSION = 5.0;
89718970
};
89728971
name = Debug;
@@ -8975,7 +8974,6 @@
89758974
isa = XCBuildConfiguration;
89768975
baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */;
89778976
buildSettings = {
8978-
CURRENT_PROJECT_VERSION = 1.18.0;
89798977
SWIFT_VERSION = 5.0;
89808978
};
89818979
name = Release;
@@ -8984,17 +8982,13 @@
89848982
isa = XCBuildConfiguration;
89858983
baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
89868984
buildSettings = {
8987-
CURRENT_PROJECT_VERSION = 1.18.0;
8988-
MARKETING_VERSION = 1.18.0;
89898985
};
89908986
name = Debug;
89918987
};
89928988
815F24141BD04D150054659F /* Release */ = {
89938989
isa = XCBuildConfiguration;
89948990
baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
89958991
buildSettings = {
8996-
CURRENT_PROJECT_VERSION = 1.18.0;
8997-
MARKETING_VERSION = 1.18.0;
89988992
};
89998993
name = Release;
90008994
};
@@ -9045,15 +9039,13 @@
90459039
baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */;
90469040
buildSettings = {
90479041
CLANG_ENABLE_MODULES = YES;
9048-
CURRENT_PROJECT_VERSION = 1.18.0;
90499042
DEFINES_MODULE = YES;
90509043
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
90519044
LD_RUNPATH_SEARCH_PATHS = (
90529045
"$(inherited)",
90539046
"@executable_path/Frameworks",
90549047
"@loader_path/Frameworks",
90559048
);
9056-
MARKETING_VERSION = 1.18.0;
90579049
SUPPORTS_MACCATALYST = NO;
90589050
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
90599051
SWIFT_VERSION = 5.0;
@@ -9066,15 +9058,13 @@
90669058
baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */;
90679059
buildSettings = {
90689060
CLANG_ENABLE_MODULES = YES;
9069-
CURRENT_PROJECT_VERSION = 1.18.0;
90709061
DEFINES_MODULE = YES;
90719062
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
90729063
LD_RUNPATH_SEARCH_PATHS = (
90739064
"$(inherited)",
90749065
"@executable_path/Frameworks",
90759066
"@loader_path/Frameworks",
90769067
);
9077-
MARKETING_VERSION = 1.18.0;
90789068
SUPPORTS_MACCATALYST = NO;
90799069
SWIFT_VERSION = 5.0;
90809070
TARGETED_DEVICE_FAMILY = "1,2";
@@ -9086,8 +9076,6 @@
90869076
baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
90879077
buildSettings = {
90889078
CLANG_MODULES_AUTOLINK = YES;
9089-
CURRENT_PROJECT_VERSION = 1.18.0;
9090-
MARKETING_VERSION = 1.18.0;
90919079
SUPPORTS_MACCATALYST = NO;
90929080
TARGETED_DEVICE_FAMILY = "1,2";
90939081
};
@@ -9098,8 +9086,6 @@
90989086
baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
90999087
buildSettings = {
91009088
CLANG_MODULES_AUTOLINK = YES;
9101-
CURRENT_PROJECT_VERSION = 1.18.0;
9102-
MARKETING_VERSION = 1.18.0;
91039089
SUPPORTS_MACCATALYST = NO;
91049090
TARGETED_DEVICE_FAMILY = "1,2";
91059091
};
@@ -9110,8 +9096,6 @@
91109096
baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
91119097
buildSettings = {
91129098
CLANG_MODULES_AUTOLINK = YES;
9113-
CURRENT_PROJECT_VERSION = 1.18.0;
9114-
MARKETING_VERSION = 1.18.0;
91159099
};
91169100
name = Debug;
91179101
};
@@ -9120,8 +9104,6 @@
91209104
baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
91219105
buildSettings = {
91229106
CLANG_MODULES_AUTOLINK = YES;
9123-
CURRENT_PROJECT_VERSION = 1.18.0;
9124-
MARKETING_VERSION = 1.18.0;
91259107
};
91269108
name = Release;
91279109
};
@@ -9130,7 +9112,6 @@
91309112
baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
91319113
buildSettings = {
91329114
CLANG_MODULES_AUTOLINK = YES;
9133-
CURRENT_PROJECT_VERSION = 1.18.0;
91349115
};
91359116
name = Debug;
91369117
};
@@ -9139,27 +9120,22 @@
91399120
baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
91409121
buildSettings = {
91419122
CLANG_MODULES_AUTOLINK = YES;
9142-
CURRENT_PROJECT_VERSION = 1.18.0;
91439123
};
91449124
name = Release;
91459125
};
91469126
97010FB51630B18F00AB761E /* Debug */ = {
91479127
isa = XCBuildConfiguration;
91489128
baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */;
91499129
buildSettings = {
9150-
CURRENT_PROJECT_VERSION = 1.18.0;
91519130
MACOSX_DEPLOYMENT_TARGET = 10.12;
9152-
MARKETING_VERSION = 1.18.0;
91539131
};
91549132
name = Debug;
91559133
};
91569134
97010FB61630B18F00AB761E /* Release */ = {
91579135
isa = XCBuildConfiguration;
91589136
baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */;
91599137
buildSettings = {
9160-
CURRENT_PROJECT_VERSION = 1.18.0;
91619138
MACOSX_DEPLOYMENT_TARGET = 10.12;
9162-
MARKETING_VERSION = 1.18.0;
91639139
};
91649140
name = Release;
91659141
};

Parse/Parse/PFConstants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#pragma mark - SDK Version
1414
///--------------------------------------
1515

16-
#define PARSE_VERSION @"1.18.0"
16+
#define PARSE_VERSION @"1.19.0"
1717

1818
///--------------------------------------
1919
#pragma mark - Platform

Parse/Parse/Resources/Parse-OSX.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>$(MARKETING_VERSION)</string>
16+
<string>1.19.0</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>$(CURRENT_PROJECT_VERSION)</string>
20+
<string>1.19.0</string>
2121
</dict>
2222
</plist>

Parse/Parse/Resources/Parse-iOS.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>$(MARKETING_VERSION)</string>
16+
<string>1.19.0</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleSupportedPlatforms</key>
2020
<array>
2121
<string>iPhoneOS</string>
2222
</array>
2323
<key>CFBundleVersion</key>
24-
<string>$(CURRENT_PROJECT_VERSION)</string>
24+
<string>1.19.0</string>
2525
<key>MinimumOSVersion</key>
2626
<string>8.0</string>
2727
</dict>

Parse/Parse/Resources/Parse-tvOS.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>$(MARKETING_VERSION)</string>
18+
<string>1.19.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<string>1.19.0</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

Parse/Parse/Resources/Parse-watchOS.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.18.0</string>
18+
<string>1.19.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<string>1.19.0</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

Parse/Tests/Other/TestCases/TestCase/PFTestCase.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ - (XCTestExpectation *)currentSelectorTestExpectation {
106106
}
107107

108108
- (void)waitForTestExpectations {
109-
[self waitForExpectationsWithTimeout:15.0 handler:nil];
109+
[self waitForExpectationsWithTimeout:25.0 handler:nil];
110110
}
111111

112112
///--------------------------------------

0 commit comments

Comments
 (0)