Skip to content

Commit c496b60

Browse files
JohnCaccavaleJohnCaccavale
authored
Merge branch 'master' into macOS_command_line_app_crash
2 parents 4a975a0 + c4a71e2 commit c496b60

File tree

424 files changed

+9537
-4603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+9537
-4603
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.github/pull_request_template.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
### Issue Description
1212
<!-- Add a brief description of the issue this PR solves. -->
1313

14-
Related issue: #`FILL_THIS_OUT`
14+
Closes: FILL_THIS_OUT
1515

1616
### Approach
1717
<!-- Add a description of the approach in this PR. -->
@@ -23,5 +23,4 @@ Related issue: #`FILL_THIS_OUT`
2323
-->
2424

2525
- [ ] Add tests
26-
- [ ] Add entry to changelog
27-
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
26+
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ on:
66
branches: [ '**' ]
77
env:
88
CI_XCODE_11: '/Applications/Xcode_11.7.app/Contents/Developer'
9-
CI_XCODE_13: '/Applications/Xcode_13.1.app/Contents/Developer'
9+
CI_XCODE_13: '/Applications/Xcode_13.4.1.app/Contents/Developer'
1010

1111
jobs:
1212
ios:
13-
runs-on: macos-latest
13+
runs-on: macos-12
1414
steps:
1515
- uses: actions/checkout@v2
16+
- name: Setup Ruby
17+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
1618
- name: Cache Gems
1719
id: cache-gems
1820
uses: actions/cache@v2
@@ -38,6 +40,8 @@ jobs:
3840
runs-on: macos-latest
3941
steps:
4042
- uses: actions/checkout@v2
43+
- name: Setup Ruby
44+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
4145
- name: Cache Gems
4246
id: cache-gems
4347
uses: actions/cache@v2
@@ -68,8 +72,12 @@ jobs:
6872
facebook_utils:
6973
needs: parseui
7074
runs-on: macos-latest
75+
env:
76+
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7177
steps:
7278
- uses: actions/checkout@v2
79+
- name: Setup Ruby
80+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
7381
- name: Cache Gems
7482
id: cache-gems
7583
uses: actions/cache@v2
@@ -78,12 +86,13 @@ jobs:
7886
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
7987
restore-keys: |
8088
${{ runner.os }}-gem-
81-
- name: Submodules and Bundle Install
89+
- name: Submodules and Bundle Install
8290
run: |
8391
git submodule update --init --recursive
8492
sudo gem install bundler
8593
bundle config set path 'vendor/bundle'
8694
bundle install
95+
carthage bootstrap --use-xcframeworks
8796
- name: Build-Test
8897
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake test:facebook_utils:ios
8998
env:
@@ -96,6 +105,8 @@ jobs:
96105
runs-on: macos-latest
97106
steps:
98107
- uses: actions/checkout@v2
108+
- name: Setup Ruby
109+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
99110
- name: Cache Gems
100111
id: cache-gems
101112
uses: actions/cache@v2
@@ -119,8 +130,12 @@ jobs:
119130

120131
parseui:
121132
runs-on: macos-latest
133+
env:
134+
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122135
steps:
123136
- uses: actions/checkout@v2
137+
- name: Setup Ruby
138+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
124139
- name: Cache Gems
125140
id: cache-gems
126141
uses: actions/cache@v2
@@ -135,10 +150,11 @@ jobs:
135150
sudo gem install bundler
136151
bundle config set path 'vendor/bundle'
137152
bundle install
153+
carthage bootstrap --use-xcframeworks
138154
- name: Build-Test
139-
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake test:parseui:all
140155
env:
141156
DEVELOPER_DIR: ${{ env.CI_XCODE_13 }}
157+
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake test:parseui:all
142158
- name: Send codecov
143159
run: bash <(curl https://codecov.io/bash)
144160

@@ -147,14 +163,18 @@ jobs:
147163
steps:
148164
- uses: actions/checkout@v2
149165
- name: CocoaPods
150-
run: set -o pipefail && env NSUnbufferedIO=YES pod lib lint --allow-warnings --verbose
166+
run: set -o pipefail && env NSUnbufferedIO=YES pod lib lint --allow-warnings --verbose --skip-import-validation
151167
env:
152168
DEVELOPER_DIR: ${{ env.CI_XCODE_13 }}
153169

154170
assets:
155-
runs-on: macos-latest
171+
runs-on: macos-11
172+
env:
173+
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
156174
steps:
157175
- uses: actions/checkout@v2
176+
- name: Setup Ruby
177+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
158178
- name: Cache Gems
159179
id: cache-gems
160180
uses: actions/cache@v2
@@ -169,6 +189,7 @@ jobs:
169189
sudo gem install bundler
170190
bundle config set path 'vendor/bundle'
171191
bundle install
192+
carthage bootstrap --use-xcframeworks
172193
- name: Build Release
173194
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake package:release
174195
env:
@@ -179,6 +200,8 @@ jobs:
179200
runs-on: macos-latest
180201
steps:
181202
- uses: actions/checkout@v2
203+
- name: Setup Ruby
204+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
182205
- name: Cache Gems
183206
id: cache-gems
184207
uses: actions/cache@v2

‎.github/workflows/release-automated.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
branches: [ master, release, alpha, beta ]
55
env:
66
CI_XCODE_11: '/Applications/Xcode_11.7.app/Contents/Developer'
7-
CI_XCODE_13: '/Applications/Xcode_13.0.app/Contents/Developer'
7+
CI_XCODE_13: '/Applications/Xcode_13.4.1.app/Contents/Developer'
88

99
jobs:
1010
release:
11-
runs-on: ubuntu-latest
11+
runs-on: macos-11
1212
outputs:
1313
current_tag: ${{ steps.tag.outputs.current_tag }}
1414
steps:
@@ -18,6 +18,8 @@ jobs:
1818
- uses: actions/setup-node@v2
1919
with:
2020
node-version: 14
21+
- name: Setup Ruby
22+
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
2123
- name: Cache Gems
2224
id: cache-gems
2325
uses: actions/cache@v2
@@ -62,6 +64,8 @@ jobs:
6264
needs: release
6365
if: needs.release.outputs.current_tag != ''
6466
runs-on: macos-11
67+
env:
68+
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6569
steps:
6670
- name: Checkout repository
6771
uses: actions/checkout@v2
@@ -81,6 +85,7 @@ jobs:
8185
sudo gem install bundler
8286
bundle config set path 'vendor/bundle'
8387
bundle install
88+
carthage bootstrap --use-xcframeworks
8489
- name: Build Release
8590
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake package:release
8691
env:

‎.github/workflows/release-manual-assets.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: release-manual-assets
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tag:
6+
default: ''
7+
description: 'Version tag:'
8+
env:
9+
CI_XCODE_11: '/Applications/Xcode_11.7.app/Contents/Developer'
10+
11+
jobs:
12+
assets:
13+
if: github.event.inputs.tag != ''
14+
runs-on: macos-11
15+
env:
16+
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v2
20+
with:
21+
ref: ${{ github.event.inputs.tag }}
22+
- name: Cache Gems
23+
id: cache-gems
24+
uses: actions/cache@v2
25+
with:
26+
path: vendor/bundle
27+
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
28+
restore-keys: |
29+
${{ runner.os }}-gem-
30+
- name: Submodules and Bundle Install
31+
run: |
32+
git submodule update --init --recursive
33+
sudo gem install bundler
34+
bundle config set path 'vendor/bundle'
35+
bundle install
36+
carthage bootstrap --use-xcframeworks
37+
- name: Build Release
38+
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake package:release
39+
env:
40+
DEVELOPER_DIR: ${{ env.CI_XCODE_11 }}
41+
- name: Deploy assets
42+
uses: svenstaro/upload-release-action@v2
43+
with:
44+
repo_token: ${{ secrets.GITHUB_TOKEN }}
45+
file: build/release/*
46+
tag: ${{ github.event.inputs.tag }}
47+
overwrite: true
48+
file_glob: true

‎.github/workflows/release-manual-cocoapods.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Trigger this workflow only to manually publish a Cocoapods release; this should only be used
2+
# in extraordinary circumstances, as releases are normally published automatically as part of
3+
# the automated release workflow.
4+
5+
name: release-manual-cocoapods
6+
on:
7+
workflow_dispatch:
8+
inputs:
9+
ref:
10+
default: ''
11+
description: 'Reference (tag / SHA):'
12+
env:
13+
CI_XCODE_13: '/Applications/Xcode_13.4.1.app/Contents/Developer'
14+
jobs:
15+
cocoapods:
16+
runs-on: macos-11
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v2
20+
with:
21+
ref: ${{ github.event.inputs.ref }}
22+
- name: CocoaPods
23+
run: set -o pipefail && env NSUnbufferedIO=YES pod lib lint --allow-warnings --verbose
24+
- name: Deploy CocoaPods
25+
run: set -o pipefail && env NSUnbufferedIO=YES pod trunk push Parse.podspec --allow-warnings --verbose
26+
env:
27+
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
28+
DEVELOPER_DIR: ${{ env.CI_XCODE_13 }}

‎CHANGELOG.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
## [2.0.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.0.0...2.0.1) (2023-01-30)
2+
3+
4+
### Bug Fixes
5+
6+
* Adding via SPM doesn't work due to unstable Bolts dependency ([#1695](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1695)) ([b264df1](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/b264df19e06a928daa222cf34fbe07b1ed51aed9))
7+
8+
# [2.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.19.4...2.0.0) (2023-01-29)
9+
10+
11+
### Features
12+
13+
* Add Swift Package Manager support; upgrade `ParseFacbookUtils` to Facebook SDK 15 ([#1683](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1683)) ([840390b](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/840390b18c8e567356103d9ff19ca21523c16ac3))
14+
15+
16+
### BREAKING CHANGES
17+
18+
* Carthage support is removed; the core module name has changed therefore the import statement is now `import ParseCore` instead of `import Parse` (#1683) ([840390b](840390b))
19+
20+
## [1.19.4](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.19.3...1.19.4) (2022-10-26)
21+
22+
23+
### Bug Fixes
24+
25+
* implementation via CocoaPods fails due to missing `FBSDKCoreKit` dependency ([#1666](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1666)) ([ac8a4fa](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/ac8a4fade08c2be59d7ece014ba429067f598deb))
26+
127
## [1.19.3](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.19.2...1.19.3) (2021-11-21)
228

329

‎Cartfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
github "BoltsFramework/Bolts-ObjC" ~> 1.9.1
2-
github "facebook/facebook-ios-sdk" == 11.0.1
2+
github "facebook/facebook-ios-sdk" == 15.1.0
3+

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "BoltsFramework/Bolts-ObjC" "1.9.1"
2-
github "facebook/facebook-ios-sdk" "v11.0.1"
2+
github "facebook/facebook-ios-sdk" "v15.1.0"

‎Carthage/Checkouts/facebook-ios-sdk‎

Submodule facebook-ios-sdk updated 2320 files

0 commit comments

Comments
 (0)