Skip to content

Commit

Permalink
Merge branch 'master' into fix/date-rounding
Browse files Browse the repository at this point in the history
  • Loading branch information
anton-plebanovich committed Jan 3, 2025
2 parents 34fa204 + 1f09fb1 commit b896b5e
Show file tree
Hide file tree
Showing 13 changed files with 267 additions and 190 deletions.
198 changes: 117 additions & 81 deletions .github/workflows/build-pr.yml

Large diffs are not rendered by default.

22 changes: 0 additions & 22 deletions .github/workflows/check-pr-title.yml

This file was deleted.

29 changes: 17 additions & 12 deletions .github/workflows/master-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
- "master"
- "release/**"
env:
XCODE_VERSION: "['15.3', '15.4', '16', '16.1_beta_3']"
XCODE_VERSION: "['15.3', '15.4', '16', '16.1', '16.2']"
PLATFORM: "['ios', 'osx', 'watchos', 'tvos', 'catalyst', 'visionos']"
RELEASE_VERSION: '15.4'
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
RELEASE_VERSION: '16.2'
DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
jobs:
prepare:
runs-on: ubuntu-latest
Expand All @@ -30,7 +30,7 @@ jobs:
version="$(sed -n 's/^VERSION=\(.*\)$/\1/p' "${GITHUB_WORKSPACE}/dependencies.list")"
echo "VERSION=$version" >> $GITHUB_OUTPUT
build-docs:
runs-on: macos-14
runs-on: macos-15
name: Package docs
needs: prepare
steps:
Expand All @@ -46,7 +46,7 @@ jobs:
name: realm-docs
path: docs/realm-docs.zip
build-examples:
runs-on: macos-14
runs-on: macos-15
name: Package examples
needs: prepare
steps:
Expand Down Expand Up @@ -77,9 +77,12 @@ jobs:
- xcode-version: 16
xcode-version-tag: '16.0'
os: macos-15
- xcode-version: 16.1_beta_3
- xcode-version: 16.1
xcode-version-tag: 16.1
os: macos-15
- xcode-version: 16.2
xcode-version-tag: 16.2
os: macos-15
exclude:
- platform: osx
configuration: static
Expand Down Expand Up @@ -108,7 +111,7 @@ jobs:
path: build.tar
compression-level: 1
package-release:
runs-on: macos-14
runs-on: macos-15
name: Package release file
needs: [build-product, prepare]
steps:
Expand All @@ -135,7 +138,7 @@ jobs:
name: test-release-package
path: pkg/realm-swift-${{ needs.prepare.outputs.VERSION }}.zip
test-package-examples:
runs-on: macos-14
runs-on: macos-15
name: Test examples
needs: [package-release, prepare]
steps:
Expand All @@ -147,15 +150,15 @@ jobs:
- name: Test examples
run: sh -x build.sh release-test-examples
test-ios-static:
runs-on: macos-14
runs-on: macos-15
name: Run tests on iOS with configuration Static
needs: package-release
steps:
- uses: actions/checkout@v4
- name: Test ios static
run: sh -x build.sh test-ios-static
test-osx-static:
runs-on: macos-14
runs-on: macos-15
name: Run tests on macOS
needs: package-release
steps:
Expand All @@ -165,7 +168,7 @@ jobs:
export REALM_DISABLE_METADATA_ENCRYPTION=1
sh -x build.sh test-osx
test-installation:
runs-on: macos-14
runs-on: macos-15
name: Run installation test
needs: [package-release, prepare]
env:
Expand Down Expand Up @@ -216,7 +219,9 @@ jobs:
os: macos-14
- xcode-version: 16
os: macos-15
- xcode-version: 16.1_beta_3
- xcode-version: 16.1
os: macos-15
- xcode-version: 16.2
os: macos-15
env:
PLATFORM: 'osx'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Publish release
on: workflow_dispatch
env:
XCODE_VERSION: "['15.3', '15.4', '16', '16.1_beta_3']"
TEST_XCODE_VERSION: '16'
XCODE_VERSION: "['15.3', '15.4', '16', '16.1', '16.2']"
TEST_XCODE_VERSION: '16.2'
jobs:
prepare:
runs-on: ubuntu-latest
Expand Down
41 changes: 38 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,59 @@
10.54.1 Release notes (2024-10-22)
x.y.z Release notes (yyyy-MM-dd)
=============================================================
### Enhancements
* None.

### Fixed
* <How to hit and notice issue? what was the impact?> ([#????](https://github.com/realm/realm-swift/issues/????), since v?.?.?)
* None.

<!-- ### Breaking Changes - ONLY INCLUDE FOR NEW MAJOR version -->

### Compatibility
* Realm Studio: 15.0.0 or later.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 16.2.0.
* CocoaPods: 1.10 or later.
* Xcode: 15.3.0-16.2.

### Internal
* Upgraded realm-core from ? to ?

10.54.2 Release notes (2024-12-17)
=============================================================

### Enhancements

* Add prebuilt binaries for Xcode 16.2.

### Compatibility

* Realm Studio: 15.0.0 or later.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 16.2.0.
* CocoaPods: 1.10 or later.
* Xcode: 15.3.0-16.2.

10.54.1 Release notes (2024-10-22)
=============================================================

### Fixed

* The events library would attempt to upload backup files created as part of
file format upgrades, causing backup copies of those backups to be made,
looping until the maximum file name size was reached
([Core #8040](https://github.com/realm/realm-core/issues/8040), since v10.26.0).

<!-- ### Breaking Changes - ONLY INCLUDE FOR NEW MAJOR version -->

### Compatibility

* Realm Studio: 15.0.0 or later.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 15.4.0.
* CocoaPods: 1.10 or later.
* Xcode: 15.3.0-16.1 beta.

### Internal

* Upgraded realm-core from v14.13.0 to 14.13.1

10.54.0 Release notes (2024-09-20)
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PackageDescription
import Foundation

let coreVersion = Version("14.13.1")
let cocoaVersion = Version("10.54.1")
let cocoaVersion = Version("10.54.2")

#if compiler(>=6)
let swiftVersion = [SwiftVersion.version("6")]
Expand Down
2 changes: 1 addition & 1 deletion Realm/ObjectServerTests/ClientResetTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ class PBSClientResetTests: ClientResetTests {

let syncManager = self.app.syncManager
syncManager.errorHandler = { error, _ in
guard nil != error as? SyncError else {
guard error is SyncError else {
return XCTFail("Bad error type: \(error)")
}
XCTFail("Expected the syncManager.ErrorHandler to not be called")
Expand Down
4 changes: 2 additions & 2 deletions Realm/Realm-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>10.54.1</string>
<string>10.54.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>10.54.1</string>
<string>10.54.2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014-2021 Realm. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ plist_get() {

iphone_name() {
if (( $(xcode_version_major) < 16 )); then
echo 'iPhone 14'
echo 'iPhone 15'
else
echo 'iPhone 16'
fi
Expand Down Expand Up @@ -1167,9 +1167,9 @@ x.y.z Release notes (yyyy-MM-dd)
### Compatibility
* Realm Studio: 15.0.0 or later.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 16.0.0.
* Carthage release for Swift is built with Xcode 16.2.0.
* CocoaPods: 1.10 or later.
* Xcode: 15.3.0-16.1 beta.
* Xcode: 15.3.0-16.2.
### Internal
* Upgraded realm-core from ? to ?
Expand Down
2 changes: 1 addition & 1 deletion dependencies.list
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION=10.54.1
VERSION=10.54.2
REALM_CORE_VERSION=v14.13.1
STITCH_VERSION=c794ec6e2b751ef0cb5ab35256b07f5fa0c74c3a
Loading

0 comments on commit b896b5e

Please sign in to comment.