Skip to content

Commit 3b7dbad

Browse files
dplewisdplewis
authored
Merge branch 'master' into exclude-keys
2 parents 3e2afc9 + 9c1aefc commit 3b7dbad

File tree

24 files changed

+1251
-1095
lines changed

24 files changed

+1251
-1095
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
branches:
99
- "**"
1010
env:
11-
CI_XCODE_15: /Applications/Xcode_15.4.0.app/Contents/Developer
12-
CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
11+
CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
1312
jobs:
1413
test-xcode:
1514
env:
@@ -19,89 +18,42 @@ jobs:
1918
matrix:
2019
include:
2120
# 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
3221
- name: Xcode 16
3322
script: build:starters
34-
iosVersion: '18.1'
23+
iosVersion: '18.5'
3524
iosDeviceModel: iPhone 16
36-
watchOsVersion: '11.1'
25+
watchOsVersion: '11.5'
3726
watchDeviceModel: Apple Watch Series 10 (46mm)
38-
tvOsVersion: '18.1'
27+
tvOsVersion: '18.5'
3928
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
4729
macosVersion: 15
4830
developerDir: CI_XCODE_16
31+
# Core Module
4932
- name: Core Module, iOS 18
5033
script: test:ios
51-
iosVersion: '18.1'
34+
iosVersion: '18.5'
5235
iosDeviceModel: iPhone 16
5336
macosVersion: 15
5437
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
7038
- name: LiveQuery Module, iOS 18
7139
script: test:parse_live_query:ios
72-
iosVersion: '18.1'
40+
iosVersion: '18.5'
7341
iosDeviceModel: iPhone 16
7442
macosVersion: 15
7543
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
8044
- name: LiveQuery Module, macOS 15
8145
script: test:parse_live_query:osx
8246
macosVersion: 15
8347
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
9048
- name: LiveQuery Module, watchOS 11
9149
script: test:parse_live_query:watchos
92-
watchOsVersion: '11.1'
50+
watchOsVersion: '11.5'
9351
watchDeviceModel: Apple Watch Series 10 (46mm)
9452
macosVersion: 15
9553
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
10254
- name: LiveQuery Module, tvOS 18
10355
script: test:parse_live_query:tvos
104-
tvOsVersion: '18.1'
56+
tvOsVersion: '18.5'
10557
tvDeviceModel: Apple TV
10658
macosVersion: 15
10759
developerDir: CI_XCODE_16
@@ -184,7 +136,7 @@ jobs:
184136
plugin: xcode
185137
file: ${{ env.COVERAGE_PATH }}
186138
docs:
187-
runs-on: macos-14
139+
runs-on: macos-15
188140
timeout-minutes: 15
189141
steps:
190142
- uses: actions/checkout@v4

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ on:
33
push:
44
branches: [ master, release, alpha, beta ]
55
env:
6-
CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
6+
CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
77

88
jobs:
99
release:
1010
runs-on: macos-15
1111
outputs:
1212
current_tag: ${{ steps.tag.outputs.current_tag }}
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
with:
1616
persist-credentials: false
17-
- uses: actions/setup-node@v2
17+
- uses: actions/setup-node@v4
1818
with:
1919
node-version: 22
2020
cache: npm
@@ -25,7 +25,7 @@ jobs:
2525
bundler-cache: true
2626
- name: Cache Gems
2727
id: cache-gems
28-
uses: actions/cache@v2
28+
uses: actions/cache@v4
2929
with:
3030
path: vendor/bundle
3131
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
default: ''
77
description: 'Version tag:'
88
env:
9-
CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
9+
CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
1010

1111
jobs:
1212
publish-docs:

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# [6.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/5.1.1...6.0.0) (2025-11-17)
2+
3+
4+
### Features
5+
6+
* Remove support for Xcode 15 ([#1865](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1865)) ([b22393c](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/b22393ce823aa470f8ead10f66f02b41132ef706))
7+
8+
9+
### BREAKING CHANGES
10+
11+
* Removes support for Xcode 15 (iOS 17, macOS 14, watchOS 10, tvOS 17). ([b22393c](b22393c))
12+
113
## [5.1.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/5.1.0...5.1.1) (2025-01-31)
214

315

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

Lines changed: 2 additions & 2 deletions
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>5.1.1</string>
16+
<string>6.0.0</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>5.1.1</string>
20+
<string>6.0.0</string>
2121
</dict>
2222
</plist>

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

Lines changed: 2 additions & 2 deletions
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>5.1.1</string>
16+
<string>6.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>5.1.1</string>
24+
<string>6.0.0</string>
2525
<key>MinimumOSVersion</key>
2626
<string>12.0</string>
2727
</dict>

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

Lines changed: 2 additions & 2 deletions
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>5.1.1</string>
18+
<string>6.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>5.1.1</string>
22+
<string>6.0.0</string>
2323
<key>NSPrincipalClass</key>
2424
<string/>
2525
</dict>

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

Lines changed: 2 additions & 2 deletions
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>5.1.1</string>
18+
<string>6.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>5.1.1</string>
22+
<string>6.0.0</string>
2323
<key>NSPrincipalClass</key>
2424
<string/>
2525
</dict>

‎Parse/Parse/Source/PFAnalytics.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99

1010
#import <Foundation/Foundation.h>
1111

12-
@import Bolts;
12+
#if __has_include(<Bolts/BFTask.h>)
13+
#import <Bolts/BFTask.h>
14+
#else
15+
#import "BFTask.h"
16+
#endif
1317

1418
#import "PFConstants.h"
1519

‎Parse/Parse/Source/PFConstants.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#pragma mark - SDK Version
1515
///--------------------------------------
1616

17-
#define PARSE_VERSION @"5.1.1"
17+
#define PARSE_VERSION @"6.0.0"
1818

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

0 commit comments

Comments
 (0)