Skip to content

Commit b147566

Browse files
authored
Merge branch 'master' into master
2 parents 21457a9 + 6c88beb commit b147566

File tree

195 files changed

+314
-15028
lines changed

Some content is hidden

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

195 files changed

+314
-15028
lines changed

Diff for: .github/dependabot.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Dependabot dependency updates
2+
# Docs: https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "npm"
7+
# Location of package-lock.json
8+
directory: "/"
9+
# Check daily for updates
10+
schedule:
11+
interval: "daily"
12+
commit-message:
13+
# Set commit message prefix
14+
prefix: "refactor"

Diff for: .github/workflows/ci.yml

+27-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
script:
2121
- test:ios
2222
- test:macos
23-
- test:parseui:all
2423
- test:parse_live_query:all
2524
- build:starters
2625
- xcode15 # runs build:starters on XCode 15
@@ -85,11 +84,34 @@ jobs:
8584
path: |
8685
~/Library/Developer/Xcode/DerivedData/Parse-*/Logs/Test
8786
~/Library/Developer/Xcode/DerivedData/**/Logs/Build
88-
- name: Upload Coverage
89-
uses: codecov/[email protected]
87+
- name: Install test parsing dependencies
88+
if: matrix.script == 'test:ios'
89+
# Workaround as codecov cannot parse xcresult files;
90+
# https://github.com/codecov/uploader/issues/1078
91+
# https://github.com/codecov/codecov-action/issues/1367
92+
run: |
93+
brew install a7ex/homebrew-formulae/xcresultparser
94+
- name: Convert Xcode test results for code coverage upload
95+
if: matrix.script == 'test:ios'
96+
env:
97+
COVERAGE_PATH: ${{ github.workspace }}/build/${{ matrix.script }}-coverage.xml
98+
run: |
99+
COVERAGE_PATH=${COVERAGE_PATH//:/-}
100+
echo COVERAGE_PATH=$COVERAGE_PATH >> $GITHUB_ENV
101+
echo "TEST_RESULTS: $TEST_RESULTS"
102+
echo "COVERAGE_PATH: $COVERAGE_PATH"
103+
set -o pipefail && \
104+
xcresultparser --output-format cobertura \
105+
"$TEST_RESULTS" >"$COVERAGE_PATH"
106+
- name: Upload code coverage
107+
if: matrix.script == 'test:ios'
108+
uses: codecov/codecov-action@v4
90109
with:
91-
xcode: true
92-
xcode_archive_path: ${{ env.TEST_RESULTS }}
110+
# Set to `true` once codecov token bug is fixed; https://github.com/parse-community/parse-server/issues/9129
111+
fail_ci_if_error: false
112+
token: ${{ secrets.CODECOV_TOKEN }}
113+
plugin: xcode
114+
file: ${{ env.COVERAGE_PATH }}
93115
docs:
94116
runs-on: macos-13
95117
timeout-minutes: 15

Diff for: .gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ docs/
3737

3838
## AppCode
3939
.idea/
40-
ParseUI/Vendor
4140

4241
# VSC
4342
.project

Diff for: CHANGELOG.md

+33
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
## [4.1.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.1.0...4.1.1) (2024-07-15)
2+
3+
4+
### Bug Fixes
5+
6+
* SPM build issues with Xcode 16 ([#1795](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1795)) ([5381325](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/5381325fae622eaa5292146ea322a00c0f46e97d))
7+
8+
# [4.1.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.0.1...4.1.0) (2024-06-17)
9+
10+
11+
### Features
12+
13+
* Add idempotency ([#1790](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1790)) ([dcdf457](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/dcdf45743eab1126a76aba34e555fb2575f67a3b))
14+
15+
## [4.0.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.0.0...4.0.1) (2024-04-28)
16+
17+
18+
### Bug Fixes
19+
20+
* LiveQuery starter project fails to build ([#1784](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1784)) ([0821194](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/08211940c839b8b9896d715891795049a6378766))
21+
22+
# [4.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/3.0.0...4.0.0) (2024-04-28)
23+
24+
25+
### Features
26+
27+
* Remove `ParseUI` ([#1783](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1783)) ([139eca7](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/139eca7f2423bf92c5b6d821eaf4cda16816dd6f))
28+
29+
30+
### BREAKING CHANGES
31+
32+
* This release removes `ParseUI`. ([139eca7](139eca7))
33+
134
# [3.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.3...3.0.0) (2024-04-08)
235

336

Diff for: Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
# Docs
4-
gem 'jazzy', '~> 0.14.4'
4+
gem 'jazzy', '~> 0.15.0'
55

66
# Development
77
gem 'xcpretty'

Diff for: Gemfile.lock

+44-40
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (6.1.7.7)
8+
activesupport (5.2.8.1)
79
concurrent-ruby (~> 1.0, >= 1.0.2)
8-
i18n (>= 1.6, < 2)
9-
minitest (>= 5.1)
10-
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.5)
13-
public_suffix (>= 2.0.2, < 6.0)
10+
i18n (>= 0.7, < 2)
11+
minitest (~> 5.1)
12+
tzinfo (~> 1.1)
13+
addressable (2.8.7)
14+
public_suffix (>= 2.0.2, < 7.0)
1415
algoliasearch (1.27.5)
1516
httpclient (~> 2.8, >= 2.8.3)
1617
json (>= 1.5.1)
1718
atomos (0.1.3)
19+
base64 (0.2.0)
1820
claide (1.1.0)
19-
cocoapods (1.15.2)
20-
addressable (~> 2.8)
21+
cocoapods (1.10.2)
22+
addressable (~> 2.6)
2123
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.15.2)
24+
cocoapods-core (= 1.10.2)
2325
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24-
cocoapods-downloader (>= 2.1, < 3.0)
26+
cocoapods-downloader (>= 1.4.0, < 2.0)
2527
cocoapods-plugins (>= 1.0.0, < 2.0)
2628
cocoapods-search (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.6.0, < 2.0)
29+
cocoapods-trunk (>= 1.4.0, < 2.0)
2830
cocoapods-try (>= 1.1.0, < 2.0)
2931
colored2 (~> 3.1)
3032
escape (~> 0.0.4)
3133
fourflusher (>= 2.3.0, < 3.0)
3234
gh_inspector (~> 1.0)
33-
molinillo (~> 0.8.0)
35+
molinillo (~> 0.6.6)
3436
nap (~> 1.0)
35-
ruby-macho (>= 2.3.0, < 3.0)
36-
xcodeproj (>= 1.23.0, < 2.0)
37-
cocoapods-core (1.15.2)
38-
activesupport (>= 5.0, < 8)
39-
addressable (~> 2.8)
37+
ruby-macho (~> 1.4)
38+
xcodeproj (>= 1.19.0, < 2.0)
39+
cocoapods-core (1.10.2)
40+
activesupport (> 5.0, < 6)
41+
addressable (~> 2.6)
4042
algoliasearch (~> 1.0)
4143
concurrent-ruby (~> 1.1)
4244
fuzzy_match (~> 2.0.4)
4345
nap (~> 1.0)
4446
netrc (~> 0.11)
45-
public_suffix (~> 4.0)
47+
public_suffix
4648
typhoeus (~> 1.0)
4749
cocoapods-deintegrate (1.0.5)
48-
cocoapods-downloader (2.1)
50+
cocoapods-downloader (1.6.3)
4951
cocoapods-plugins (1.0.0)
5052
nap
5153
cocoapods-search (1.0.1)
@@ -54,70 +56,72 @@ GEM
5456
netrc (~> 0.11)
5557
cocoapods-try (1.2.0)
5658
colored2 (3.1.2)
57-
concurrent-ruby (1.2.2)
59+
concurrent-ruby (1.3.3)
5860
escape (0.0.4)
5961
ethon (0.16.0)
6062
ffi (>= 1.15.0)
61-
ffi (1.16.3)
63+
ffi (1.17.0)
6264
fourflusher (2.3.1)
6365
fuzzy_match (2.0.4)
6466
gh_inspector (1.1.3)
6567
httpclient (2.8.3)
66-
i18n (1.14.1)
68+
i18n (1.14.5)
6769
concurrent-ruby (~> 1.0)
68-
jazzy (0.14.4)
70+
jazzy (0.15.1)
6971
cocoapods (~> 1.5)
7072
mustache (~> 1.1)
7173
open4 (~> 1.3)
7274
redcarpet (~> 3.4)
73-
rexml (~> 3.2)
75+
rexml (>= 3.2.7, < 4.0)
7476
rouge (>= 2.0.6, < 5.0)
7577
sassc (~> 2.1)
7678
sqlite3 (~> 1.3)
7779
xcinvoke (~> 0.3.0)
78-
json (2.6.3)
80+
json (2.7.2)
7981
liferaft (0.0.6)
80-
mini_portile2 (2.8.4)
81-
minitest (5.20.0)
82-
molinillo (0.8.0)
82+
mini_portile2 (2.8.7)
83+
minitest (5.24.1)
84+
molinillo (0.6.6)
8385
mustache (1.1.1)
8486
nanaimo (0.3.0)
8587
nap (1.1.0)
8688
netrc (0.11.0)
89+
nkf (0.2.0)
8790
open4 (1.3.4)
8891
plist (3.7.1)
8992
public_suffix (4.0.7)
9093
rake (13.0.6)
9194
redcarpet (3.6.0)
92-
rexml (3.2.6)
95+
rexml (3.3.6)
96+
strscan
9397
rouge (2.0.7)
94-
ruby-macho (2.5.1)
98+
ruby-macho (1.4.0)
9599
sassc (2.4.0)
96100
ffi (~> 1.9)
97-
sqlite3 (1.6.6)
101+
sqlite3 (1.7.3)
98102
mini_portile2 (~> 2.8.0)
99-
typhoeus (1.4.0)
103+
strscan (3.1.0)
104+
thread_safe (0.3.6)
105+
typhoeus (1.4.1)
100106
ethon (>= 0.9.0)
101-
tzinfo (2.0.6)
102-
concurrent-ruby (~> 1.0)
107+
tzinfo (1.2.11)
108+
thread_safe (~> 0.1)
103109
xcinvoke (0.3.0)
104110
liferaft (~> 0.0.6)
105-
xcodeproj (1.23.0)
111+
xcodeproj (1.19.0)
106112
CFPropertyList (>= 2.3.3, < 4.0)
107113
atomos (~> 0.1.3)
108114
claide (>= 1.0.2, < 2.0)
109115
colored2 (~> 3.1)
110116
nanaimo (~> 0.3.0)
111-
rexml (~> 3.2.4)
112117
xcpretty (0.3.0)
113118
rouge (~> 2.0.7)
114-
zeitwerk (2.6.13)
115119

116120
PLATFORMS
117121
ruby
118122

119123
DEPENDENCIES
120-
jazzy (~> 0.14.4)
124+
jazzy (~> 0.15.0)
121125
plist
122126
rake
123127
xcpretty

Diff for: Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
37-
"version": "4.0.6"
36+
"revision": "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
37+
"version": "4.0.8"
3838
}
3939
}
4040
]

0 commit comments

Comments
 (0)