Skip to content

Commit 660748c

Browse files
dplewisdplewis
committed
Merge remote-tracking branch 'upstream/master' into objectFromDictionary
2 parents 9446df6 + 4d83377 commit 660748c

File tree

28 files changed

+251
-78
lines changed

28 files changed

+251
-78
lines changed

Diff for: ‎.github/workflows/ci.yml

+97-16
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,106 @@ on:
88
branches:
99
- "**"
1010
env:
11-
CI_XCODE_14: /Applications/Xcode_14.2.app/Contents/Developer
1211
CI_XCODE_15: /Applications/Xcode_15.4.0.app/Contents/Developer
13-
CI_XCODE_16: /Applications/Xcode_16.0.app/Contents/Developer
12+
CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
1413
jobs:
15-
tests:
14+
test-xcode:
1615
env:
1716
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1817
timeout-minutes: 45
1918
strategy:
2019
matrix:
21-
script:
22-
- test:ios
23-
- test:macos
24-
- test:parse_live_query:all
25-
- xcode14 # runs build:starters on Xcode 14
26-
- xcode15 # runs build:starters on Xcode 15
27-
- xcode16 # runs build:starters on Xcode 16
20+
include:
21+
# Xcode
22+
- name: Xcode 15
23+
script: build:starters
24+
iosVersion: '18.1'
25+
iosDeviceModel: iPhone 16
26+
watchOsVersion: '11.1'
27+
watchDeviceModel: Apple Watch Series 10 (46mm)
28+
tvOsVersion: '18.1'
29+
tvDeviceModel: Apple TV
30+
macosVersion: 14
31+
developerDir: CI_XCODE_15
32+
- name: Xcode 16
33+
script: build:starters
34+
iosVersion: '18.1'
35+
iosDeviceModel: iPhone 16
36+
watchOsVersion: '11.1'
37+
watchDeviceModel: Apple Watch Series 10 (46mm)
38+
tvOsVersion: '18.1'
39+
tvDeviceModel: Apple TV
40+
macosVersion: 14
41+
developerDir: CI_XCODE_16
42+
# Core Module
43+
- name: Core Module, iOS 17
44+
script: test:ios
45+
iosVersion: '17.5'
46+
iosDeviceModel: iPhone 15
47+
macosVersion: 15
48+
developerDir: CI_XCODE_16
49+
- name: Core Module, iOS 18
50+
script: test:ios
51+
iosVersion: '18.1'
52+
iosDeviceModel: iPhone 16
53+
macosVersion: 15
54+
developerDir: CI_XCODE_16
55+
- name: Core Module, macOS 14
56+
script: test:macos
57+
macosVersion: 14
58+
developerDir: CI_XCODE_16
59+
- name: Core Module, macOS 15
60+
script: test:macos
61+
macosVersion: 15
62+
developerDir: CI_XCODE_16
63+
# LiveQuery Module
64+
- name: LiveQuery Module, iOS 17
65+
script: test:parse_live_query:ios
66+
iosVersion: '17.5'
67+
iosDeviceModel: iPhone 15
68+
macosVersion: 15
69+
developerDir: CI_XCODE_16
70+
- name: LiveQuery Module, iOS 18
71+
script: test:parse_live_query:ios
72+
iosVersion: '18.1'
73+
iosDeviceModel: iPhone 16
74+
macosVersion: 15
75+
developerDir: CI_XCODE_16
76+
- name: LiveQuery Module, macOS 14
77+
script: test:parse_live_query:osx
78+
macosVersion: 14
79+
developerDir: CI_XCODE_15
80+
- name: LiveQuery Module, macOS 15
81+
script: test:parse_live_query:osx
82+
macosVersion: 15
83+
developerDir: CI_XCODE_16
84+
- name: LiveQuery Module, watchOS 10
85+
script: test:parse_live_query:watchos
86+
watchOsVersion: '10.5'
87+
watchDeviceModel: Apple Watch Series 9 (45mm)
88+
macosVersion: 15
89+
developerDir: CI_XCODE_15
90+
- name: LiveQuery Module, watchOS 11
91+
script: test:parse_live_query:watchos
92+
watchOsVersion: '11.1'
93+
watchDeviceModel: Apple Watch Series 10 (46mm)
94+
macosVersion: 15
95+
developerDir: CI_XCODE_16
96+
- name: LiveQuery Module, tvOS 17
97+
script: test:parse_live_query:tvos
98+
tvOsVersion: '17.5'
99+
tvDeviceModel: Apple TV
100+
macosVersion: 15
101+
developerDir: CI_XCODE_16
102+
- name: LiveQuery Module, tvOS 18
103+
script: test:parse_live_query:tvos
104+
tvOsVersion: '18.1'
105+
tvDeviceModel: Apple TV
106+
macosVersion: 15
107+
developerDir: CI_XCODE_16
28108
fail-fast: false
29-
runs-on: ${{ ((matrix.script == 'xcode15' || matrix.script == 'xcode16') && 'macos-14') || 'macos-13' }}
109+
runs-on: macos-${{ matrix.macosVersion }}
110+
name: ${{ matrix.name }}
30111
steps:
31112
- uses: actions/checkout@v4
32113
- name: Cache SPM
@@ -49,9 +130,9 @@ jobs:
49130
- name: Submodules
50131
run: git submodule update --init --recursive
51132
- name: Build-Test
52-
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ ((matrix.script == 'xcode14' || matrix.script == 'xcode15' || matrix.script == 'xcode16') && 'build:starters') || matrix.script }}
133+
run: set -o pipefail && env NSUnbufferedIO=YES IOS_VERSION="${{ matrix.iosVersion }}" IOS_DEVICE_MODEL="${{ matrix.iosDeviceModel }}" WATCH_DEVICE_MODEL="${{ matrix.watchDeviceModel }}" WATCH_OS_VERSION="${{ matrix.watchOsVersion }}" TV_DEVICE_MODEL="${{ matrix.tvDeviceModel }}" TV_OS_VERSION="${{ matrix.tvOsVersion }}" bundle exec rake ${{ matrix.script }}
53134
env:
54-
DEVELOPER_DIR: ${{ (matrix.script == 'xcode15' && env.CI_XCODE_15) || (matrix.script == 'xcode16' && env.CI_XCODE_16) || env.CI_XCODE_14 }}
135+
DEVELOPER_DIR: ${{ env[matrix.developerDir] }}
55136
- name: Generate Environment Variables
56137
if: ${{ always() }}
57138
env:
@@ -68,7 +149,7 @@ jobs:
68149
echo "Build Result Location: $BUILD_RESULTS"
69150
- name: Upload Artifact Logs
70151
if: ${{ failure() }}
71-
uses: actions/upload-artifact@v3
152+
uses: actions/upload-artifact@v4
72153
with:
73154
name: ${{ env.ARTIFACT_NAME }}
74155
path: |
@@ -103,7 +184,7 @@ jobs:
103184
plugin: xcode
104185
file: ${{ env.COVERAGE_PATH }}
105186
docs:
106-
runs-on: macos-13
187+
runs-on: macos-14
107188
timeout-minutes: 15
108189
steps:
109190
- uses: actions/checkout@v4
@@ -117,7 +198,7 @@ jobs:
117198
run: |
118199
./Scripts/jazzy.sh
119200
env:
120-
DEVELOPER_DIR: ${{ env.CI_XCODE_14 }}
201+
DEVELOPER_DIR: ${{ env.CI_XCODE_16 }}
121202
concurrency:
122203
group: ${{ github.workflow }}-${{ github.ref }}
123204
cancel-in-progress: true

Diff for: ‎.github/workflows/release-automated.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
push:
44
branches: [ master, release, alpha, beta ]
55
env:
6-
CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer'
6+
CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
77

88
jobs:
99
release:
10-
runs-on: macos-13
10+
runs-on: macos-15
1111
outputs:
1212
current_tag: ${{ steps.tag.outputs.current_tag }}
1313
steps:
@@ -19,7 +19,10 @@ jobs:
1919
node-version: 22
2020
cache: npm
2121
- name: Setup Ruby
22-
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
22+
uses: ruby/setup-ruby@v1
23+
with:
24+
ruby-version: '3.1.0'
25+
bundler-cache: true
2326
- name: Cache Gems
2427
id: cache-gems
2528
uses: actions/cache@v2
@@ -46,7 +49,7 @@ jobs:
4649
publish-docs:
4750
needs: release
4851
if: needs.release.outputs.current_tag != ''
49-
runs-on: macos-13
52+
runs-on: macos-15
5053
steps:
5154
- name: Checkout repository
5255
uses: actions/checkout@v4
@@ -62,7 +65,7 @@ jobs:
6265
run: |
6366
./Scripts/jazzy.sh
6467
env:
65-
DEVELOPER_DIR: ${{ env.CI_XCODE_14 }}
68+
DEVELOPER_DIR: ${{ env.CI_XCODE_16 }}
6669
- name: Deploy Jazzy Docs
6770
uses: peaceiris/actions-gh-pages@v3
6871
with:

Diff for: ‎.github/workflows/release-manual-docs.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
default: ''
77
description: 'Version tag:'
88
env:
9-
CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer'
9+
CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
1010

1111
jobs:
1212
publish-docs:
1313
if: github.event.inputs.tag != ''
14-
runs-on: macos-13
14+
runs-on: macos-15
1515
steps:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
@@ -20,14 +20,15 @@ jobs:
2020
- name: Setup Ruby
2121
uses: ruby/setup-ruby@v1
2222
with:
23+
ruby-version: '3.1.0'
2324
bundler-cache: true
2425
- name: Submodules
2526
run: git submodule update --init --recursive
2627
- name: Create Jazzy Docs
2728
run: |
2829
./Scripts/jazzy.sh
2930
env:
30-
DEVELOPER_DIR: ${{ env.CI_XCODE_14 }}
31+
DEVELOPER_DIR: ${{ env.CI_XCODE_16 }}
3132
- name: Deploy Jazzy Docs
3233
uses: peaceiris/actions-gh-pages@v3
3334
with:

Diff for: ‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# [5.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.2.0...5.0.0) (2025-01-28)
2+
3+
4+
### Features
5+
6+
* Remove support for Xcode 14 ([#1835](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1835)) ([e94c4d5](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/e94c4d5498e0f1241dba88a89e0547b8e6cccccb))
7+
8+
9+
### BREAKING CHANGES
10+
11+
* This release removes support for Xcode 14. ([e94c4d5](e94c4d5))
12+
113
# [4.2.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.1.2...4.2.0) (2024-11-30)
214

315

Diff for: ‎Gemfile

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

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

66
# Development
7-
gem 'xcpretty', '~> 0.4.0'
8-
gem 'rake', '~> 13.2.1'
9-
gem 'plist', '~> 3.7.1'
7+
gem 'xcpretty', '0.3.0'
8+
gem 'rake', '13.2.1'
9+
gem 'plist', '3.7.1'

Diff for: ‎Gemfile.lock

+7-7
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ GEM
103103
rake (13.2.1)
104104
redcarpet (3.6.0)
105105
rexml (3.3.9)
106-
rouge (3.28.0)
106+
rouge (2.0.7)
107107
ruby-macho (2.5.1)
108108
sassc (2.4.0)
109109
ffi (~> 1.9)
@@ -123,18 +123,18 @@ GEM
123123
colored2 (~> 3.1)
124124
nanaimo (~> 0.4.0)
125125
rexml (>= 3.3.6, < 4.0)
126-
xcpretty (0.4.0)
127-
rouge (~> 3.28.0)
126+
xcpretty (0.3.0)
127+
rouge (~> 2.0.7)
128128

129129
PLATFORMS
130130
arm64-darwin
131131
x86_64-darwin
132132

133133
DEPENDENCIES
134-
jazzy (~> 0.15.3)
135-
plist (~> 3.7.1)
136-
rake (~> 13.2.1)
137-
xcpretty (~> 0.4.0)
134+
jazzy (= 0.15.3)
135+
plist (= 3.7.1)
136+
rake (= 13.2.1)
137+
xcpretty (= 0.3.0)
138138

139139
BUNDLED WITH
140140
2.5.22

Diff for: ‎Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
<Test
8282
Identifier = "ExtensionDataSharingTests">
8383
</Test>
84+
<Test
85+
Identifier = "InstallationUnitTests/testInstallationHasApplicationBadge">
86+
</Test>
87+
<Test
88+
Identifier = "InstallationUnitTests/testInstallationSetsApplicationBadge">
89+
</Test>
8490
<Test
8591
Identifier = "PFTestCase">
8692
</Test>
@@ -90,6 +96,9 @@
9096
<Test
9197
Identifier = "ParseClientConfigurationTests/testExtensionDataSharing">
9298
</Test>
99+
<Test
100+
Identifier = "ParseClientConfigurationTests/testServerValidation">
101+
</Test>
93102
</SkippedTests>
94103
</TestableReference>
95104
</Testables>

Diff for: ‎Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-macOS.xcscheme

+5
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@
6262
BlueprintName = "ParseUnitTests-macOS"
6363
ReferencedContainer = "container:Parse.xcodeproj">
6464
</BuildableReference>
65+
<SkippedTests>
66+
<Test
67+
Identifier = "ParseClientConfigurationTests/testServerValidation">
68+
</Test>
69+
</SkippedTests>
6570
</TestableReference>
6671
</Testables>
6772
</TestAction>

Diff for: ‎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>4.2.0</string>
16+
<string>5.0.0</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>4.2.0</string>
20+
<string>5.0.0</string>
2121
</dict>
2222
</plist>

Diff for: ‎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>4.2.0</string>
16+
<string>5.0.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>4.2.0</string>
24+
<string>5.0.0</string>
2525
<key>MinimumOSVersion</key>
2626
<string>12.0</string>
2727
</dict>

Diff for: ‎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>4.2.0</string>
18+
<string>5.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>4.2.0</string>
22+
<string>5.0.0</string>
2323
<key>NSPrincipalClass</key>
2424
<string/>
2525
</dict>

Diff for: ‎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>4.2.0</string>
18+
<string>5.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>4.2.0</string>
22+
<string>5.0.0</string>
2323
<key>NSPrincipalClass</key>
2424
<string/>
2525
</dict>

Diff for: ‎Parse/Parse/Source/PFConstants.h

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

17-
#define PARSE_VERSION @"4.2.0"
17+
#define PARSE_VERSION @"5.0.0"
1818

1919
///--------------------------------------
2020
#pragma mark - Platform

0 commit comments

Comments
 (0)