diff options
author | marinofaggiana <marino@marinofaggiana.com> | 2020-09-03 11:21:03 +0300 |
---|---|---|
committer | marinofaggiana <marino@marinofaggiana.com> | 2020-09-03 11:21:03 +0300 |
commit | b2596a370cb02ea62b8ea12e7717adb249c84e52 (patch) | |
tree | 558ae95e6a1fafb1bdb566bb41eef2e777fb54b5 /Carthage | |
parent | 0205f41bfd44342e18fb362a469b5956772ce01c (diff) |
coding
Diffstat (limited to 'Carthage')
7 files changed, 71 insertions, 27 deletions
diff --git a/Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGDocument.h b/Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGDocument.h index 8139a7c31..f099b06f7 100644 --- a/Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGDocument.h +++ b/Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGDocument.h @@ -15,7 +15,7 @@ #import <Foundation/Foundation.h> -#import "Document.h" +#import <SVGKit/Document.h> #import "SVGSVGElement.h" @interface SVGDocument : Document diff --git a/Carthage/Checkouts/realm-cocoa/CHANGELOG.md b/Carthage/Checkouts/realm-cocoa/CHANGELOG.md index bca00c775..aa1766185 100644 --- a/Carthage/Checkouts/realm-cocoa/CHANGELOG.md +++ b/Carthage/Checkouts/realm-cocoa/CHANGELOG.md @@ -1,3 +1,31 @@ +5.3.6 Release notes (2020-09-02) +============================================================= + +### Fixed + +* Work around iOS 14 no longer allowing the use of file locks in shared + containers, which resulted in the OS killing an app which entered the + background while a Realm was open ([#6671](https://github.com/realm/realm-cocoa/issues/6671)). +* If an attempt to upgrade a realm has ended with a crash with "migrate_links()" + in the call stack, the realm was left in an invalid state. The migration + logic now handles this state and can complete upgrading files which were + incompletely upgraded by pre-5.3.4 versions. +* Fix deadlocks when writing to a Realm file on an exFAT partition from macOS. + ([#6691](https://github.com/realm/realm-cocoa/issues/6691)). + +### Compatibility + +* File format: Generates Realms with format v10 (Reads and upgrades all previous formats) +* Realm Object Server: 3.21.0 or later. +* Realm Studio: 3.11 or later. +* APIs are backwards compatible with all previous releases in the 5.x.y series. +* Carthage release for Swift is built with Xcode 11.6. + +### Internal + +* Upgraded realm-core from v6.0.19 to v6.0.23 +* Upgraded realm-sync from v5.0.16 to v5.0.20 + 5.3.5 Release notes (2020-08-20) ============================================================= diff --git a/Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist b/Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist index 203e70628..73eac0b6e 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist +++ b/Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist @@ -17,11 +17,11 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>5.3.5</string> + <string>5.3.6</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>5.3.5</string> + <string>5.3.6</string> <key>NSHumanReadableCopyright</key> <string>Copyright © 2014 Realm. All rights reserved.</string> <key>NSPrincipalClass</key> diff --git a/Carthage/Checkouts/realm-cocoa/Realm/Tests/RealmTests.mm b/Carthage/Checkouts/realm-cocoa/Realm/Tests/RealmTests.mm index 034d5439a..b912a17d8 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/Tests/RealmTests.mm +++ b/Carthage/Checkouts/realm-cocoa/Realm/Tests/RealmTests.mm @@ -2033,9 +2033,9 @@ XCTAssertEqualObjects([testObjects.firstObject stringCol], @"b", @"Expecting column to be 'b'"); } - -- (void)testInvalidLockFile -{ +// iOS uses a different locking scheme which breaks how we stop core from reinitializing the lock file +#if !TARGET_OS_IPHONE +- (void)testInvalidLockFile { // Create the realm file and lock file @autoreleasepool { [RLMRealm defaultRealm]; } @@ -2059,6 +2059,7 @@ flock(fd, LOCK_UN); close(fd); } +#endif - (void)testCannotMigrateRealmWhenRealmIsOpen { RLMRealm *realm = [self realmWithTestPath]; diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift index d5b1589ea..c5308653a 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift @@ -107,26 +107,26 @@ extension Realm { exclusive with `inMemoryIdentifier`. */ public var syncConfiguration: SyncConfiguration? { + get { + return _syncConfiguration + } set { _inMemoryIdentifier = nil _syncConfiguration = newValue } - get { - return _syncConfiguration - } } private var _syncConfiguration: SyncConfiguration? /// The local URL of the Realm file. Mutually exclusive with `inMemoryIdentifier`. public var fileURL: URL? { + get { + return _path.map { URL(fileURLWithPath: $0) } + } set { _inMemoryIdentifier = nil _path = newValue?.path } - get { - return _path.map { URL(fileURLWithPath: $0) } - } } private var _path: String? @@ -134,14 +134,14 @@ extension Realm { /// A string used to identify a particular in-memory Realm. Mutually exclusive with `fileURL` and /// `syncConfiguration`. public var inMemoryIdentifier: String? { + get { + return _inMemoryIdentifier + } set { _path = nil _syncConfiguration = nil _inMemoryIdentifier = newValue } - get { - return _inMemoryIdentifier - } } private var _inMemoryIdentifier: String? @@ -199,12 +199,12 @@ extension Realm { /// The classes managed by the Realm. public var objectTypes: [Object.Type]? { - set { - self.customSchema = newValue.map { RLMSchema(objectClasses: $0) } - } get { return self.customSchema.map { $0.objectSchema.compactMap { $0.objectClass as? Object.Type } } } + set { + self.customSchema = newValue.map { RLMSchema(objectClasses: $0) } + } } /** The maximum number of live versions in the Realm file before an exception will diff --git a/Carthage/Checkouts/realm-cocoa/build.sh b/Carthage/Checkouts/realm-cocoa/build.sh index 1d42ad5f8..b3bf923d5 100755 --- a/Carthage/Checkouts/realm-cocoa/build.sh +++ b/Carthage/Checkouts/realm-cocoa/build.sh @@ -358,7 +358,7 @@ download_common() { echo "Switching from version $(cat core/version.txt) to ${version}" fi else - if [ "$(find core -name librealm.a)" ]; then + if [ "$(find core -name librealm-sync.a)" ]; then echo 'Using existing custom core build without checking version' exit 0 fi @@ -398,11 +398,26 @@ download_common() { ( cd "$temp_dir" - rm -rf "$download_type" + rm -rf core tar xf "$tar_path" --xz if [ ! -f core/version.txt ]; then printf %s "${version}" > core/version.txt fi + + # Xcode 11 dsymutil crashes when given debugging symbols created by + # Xcode 12. Check if this breaks, and strip them if so. + local test_lib=core/realm-sync-dbg.xcframework/ios-*-simulator/librealm-sync-dbg.a + if ! [ -f $test_lib ]; then + test_lib="core/librealm-sync-ios-dbg.a" + fi + clang++ -Wl,-all_load -g -arch x86_64 -shared -target ios13.0 \ + -isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -o tmp.dylib \ + $test_lib -lz -framework Security + if ! dsymutil tmp.dylib -o tmp.dSYM 2> /dev/null; then + find core -name '*.a' -exec strip -x "{}" \; 2> /dev/null + fi + rm -r tmp.dylib tmp.dSYM + mv core "${versioned_dir}" ) @@ -1210,10 +1225,10 @@ EOM if [ ! -f core/version.txt ]; then sh build.sh download-sync - mv core/librealm-ios.a core/librealmcore-ios.a - mv core/librealm-macosx.a core/librealmcore-macosx.a - mv core/librealm-tvos.a core/librealmcore-tvos.a - mv core/librealm-watchos.a core/librealmcore-watchos.a + mv core/librealm-sync-ios.a core/librealmcore-ios.a + mv core/librealm-sync-macosx.a core/librealmcore-macosx.a + mv core/librealm-sync-tvos.a core/librealmcore-tvos.a + mv core/librealm-sync-watchos.a core/librealmcore-watchos.a rm core/librealm*-dbg.a fi diff --git a/Carthage/Checkouts/realm-cocoa/dependencies.list b/Carthage/Checkouts/realm-cocoa/dependencies.list index 362315640..65c8c7eea 100644 --- a/Carthage/Checkouts/realm-cocoa/dependencies.list +++ b/Carthage/Checkouts/realm-cocoa/dependencies.list @@ -1,4 +1,4 @@ -VERSION=5.3.5 -REALM_CORE_VERSION=6.0.19 -REALM_SYNC_VERSION=5.0.16 +VERSION=5.3.6 +REALM_CORE_VERSION=6.0.23 +REALM_SYNC_VERSION=5.0.20 REALM_OBJECT_SERVER_VERSION=3.28.5 |