Skip to content

Commit

Permalink
Merge branch 'tg/xcode-15.2'
Browse files Browse the repository at this point in the history
* tg/xcode-15.2:
  Release 10.45.3
  Revert changes to the examples which broke them when packaged in releases
  Update release packaging for Xcode 15.2
  • Loading branch information
tgoyne committed Jan 9, 2024
2 parents 72a0e6a + 12d4bee commit 836cc4b
Show file tree
Hide file tree
Showing 26 changed files with 85 additions and 467 deletions.
19 changes: 7 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
x.y.z Release notes (yyyy-MM-dd)
10.45.3 Release notes (2024-01-08)
=============================================================
### Enhancements
* None.

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

<!-- ### Breaking Changes - ONLY INCLUDE FOR NEW MAJOR version -->
* Update release packaging for Xcode 15.2. Prebuilt binaries for 14.1 and 15.0
have now been dropped from the release package.

### Compatibility

* Realm Studio: 14.0.1 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.1.0.
* Carthage release for Swift is built with Xcode 15.2.0.
* CocoaPods: 1.10 or later.
* Xcode: 14.1-15.1.0.

### Internal
* Upgraded realm-core from ? to ?
* Xcode: 14.2-15.2.0.

10.45.2 Release notes (2023-12-22)
=============================================================
Expand Down
11 changes: 6 additions & 5 deletions Jenkinsfile.releasability
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
xcodeVersions = ['14.1', '14.2', '14.3.1', '15.0', '15.1']
xcodeVersions = ['14.2', '14.3.1', '15.1', '15.2']
platforms = ['osx', 'ios', 'watchos', 'tvos', 'catalyst']
platformNames = ['osx': 'macOS', 'ios': 'iOS', 'watchos': 'watchOS', 'tvos': 'tvOS', 'catalyst': 'Catalyst', 'visionos': 'visionOS']
docsXcodeVersion = '14.3.1'
Expand Down Expand Up @@ -121,7 +121,7 @@ def doBuild() {
parallelBuilds["${platformName} ${xcodeVersion}"] = buildPlatform(platform, xcodeVersion)
}
}
// parallelBuilds["visionOS 15.2"] = buildPlatform('visionos', '15.2')
parallelBuilds["visionOS 15.2"] = buildPlatform('visionos', '15.2')

parallel parallelBuilds
}
Expand All @@ -135,12 +135,12 @@ def doBuild() {
unstash "${platform}-${xcodeVersion}"
}
}
// unstash 'visionos-15.2'
unstash 'visionos-15.2'

unstash 'examples'
unstash 'build-scripts'

withEnv(['DEVELOPER_DIR=/Applications/Xcode-15.1.app/Contents/Developer']) {
withEnv(['DEVELOPER_DIR=/Applications/Xcode-15.2.app/Contents/Developer']) {
sh './build.sh package-release'
}

Expand Down Expand Up @@ -181,11 +181,12 @@ def doBuild() {
},

'Test macOS': {
node('osx') {
node('macos_13') {
deleteDir()
unstash 'source'
sh '''
export REALM_DISABLE_METADATA_ENCRYPTION=1
export REALM_XCODE_VERSION=15.2
sh build.sh test-osx
'''
}
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("13.25.1")
let cocoaVersion = Version("10.45.2")
let cocoaVersion = Version("10.45.3")

let cxxSettings: [CXXSetting] = [
.headerSearchPath("."),
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.45.2</string>
<string>10.45.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>10.45.2</string>
<string>10.45.3</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014-2021 Realm. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1138,9 +1138,9 @@ x.y.z Release notes (yyyy-MM-dd)
### Compatibility
* Realm Studio: 14.0.1 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.1.0.
* Carthage release for Swift is built with Xcode 15.2.0.
* CocoaPods: 1.10 or later.
* Xcode: 14.1-15.1.0.
* Xcode: 14.2-15.2.0.
### 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.45.2
VERSION=10.45.3
REALM_CORE_VERSION=13.25.1
STITCH_VERSION=8bf8ebcff6e804586c30a6ccbadb060753071a42
Loading

0 comments on commit 836cc4b

Please sign in to comment.