Skip to content

Commit

Permalink
Merge pull request #8106 from realm/tg/xcode-14.0.1
Browse files Browse the repository at this point in the history
Add some missing @preconcurrency annotations
  • Loading branch information
tgoyne authored Jan 20, 2023
2 parents 824b625 + 2752925 commit b1072f3
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 23 deletions.
9 changes: 0 additions & 9 deletions .jenkins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,6 @@ exclude:
- xcode_version: 14.1
target: swiftpm-thread

- xcode_version: 13.4.1
target: swiftpm-ios

- xcode_version: 14.0.1
target: swiftpm-ios

- xcode_version: 14.1
target: swiftpm-ios

- xcode_version: 14.0.1
target: ios-static

Expand Down
14 changes: 5 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
x.y.z Release notes (yyyy-MM-dd)
10.34.1 Release notes (2023-01-20)
=============================================================
### 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 -->
* Add some missing `@preconcurrency` annotations which lead to build failures
with Xcode 14.0 when importing via SPM or CocoaPods
([#8104](https://github.com/realm/realm-swift/issues/8104), since v10.34.0).

### Compatibility

* Realm Studio: 11.0.0 - 12.0.0.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 14.2.
* CocoaPods: 1.10 or later.
* Xcode: 13.3-14.2.

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

10.34.0 Release notes (2023-01-13)
=============================================================

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 coreVersionStr = "12.13.0"
let cocoaVersionStr = "10.34.0"
let cocoaVersionStr = "10.34.1"

let coreVersionPieces = coreVersionStr.split(separator: ".")
let coreVersionExtra = coreVersionPieces[2].split(separator: "-")
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.34.0</string>
<string>10.34.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>10.34.0</string>
<string>10.34.1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014-2021 Realm. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 4 additions & 0 deletions RealmSwift/ObjectiveCSupport.swift
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ import Realm
}

/// Convert a `RLMShouldCompactOnLaunchBlock` to a Realm Swift compact block.
@preconcurrency
public static func convert(object: @escaping RLMShouldCompactOnLaunchBlock) -> @Sendable (Int, Int) -> Bool {
return { totalBytes, usedBytes in
return object(UInt(totalBytes), UInt(usedBytes))
Expand All @@ -173,6 +174,7 @@ import Realm
}

/// Convert an RLMClientResetBeforeBlock to a RealmSwift before block
@preconcurrency
public static func convert(object: RLMClientResetBeforeBlock?) -> (@Sendable (Realm) -> Void)? {
guard let object = object else {
return nil
Expand All @@ -194,6 +196,7 @@ import Realm
}

/// Convert an RLMClientResetAfterBlock to a RealmSwift after block
@preconcurrency
public static func convert(object: RLMClientResetAfterBlock?) -> (@Sendable (Realm, Realm) -> Void)? {
guard let object = object else {
return nil
Expand All @@ -212,6 +215,7 @@ import Realm
}

/// Converts a block receiving a `RLMSyncSubscriptionSet`to a swift block receiving a `SyncSubscriptionSet`.
@preconcurrency
public static func convert(block: RLMFlexibleSyncInitialSubscriptionsBlock?) -> (@Sendable (SyncSubscriptionSet) -> Void)? {
guard let block = block else {
return nil
Expand Down
1 change: 1 addition & 0 deletions RealmSwift/Sync.swift
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ public typealias Provider = RLMIdentityProvider
/// - If no block is set in either location, the client reset will not be handled. The application will likely need to be restarted and unsynced local changes may be lost.
/// - note: The ``SyncManager.errorHandler`` is still invoked under all ``RLMSyncError``s *other than* ``RLMSyncErrorClientResetError``.
/// - seeAlso ``RLMSyncError`` for an exhaustive list.
@preconcurrency
case manual(errorHandler: ErrorReportingBlock? = nil)
}

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.34.0
VERSION=10.34.1
REALM_CORE_VERSION=12.13.0
STITCH_VERSION=f21811d39c37579cdbeb816ffa3a6c709da04bab
2 changes: 1 addition & 1 deletion scripts/pr-ci-matrix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def minimum_version(major)
'swiftpm-debug' => all,
'swiftpm-address' => latest_only,
'swiftpm-thread' => latest_only,
'swiftpm-ios' => latest_only,
'swiftpm-ios' => all,

'ios-static' => oldest_and_latest,
'ios-dynamic' => oldest_and_latest,
Expand Down

0 comments on commit b1072f3

Please sign in to comment.