diff options
| author | marinofaggiana <marino@marinofaggiana.com> | 2020-07-01 16:19:12 +0300 |
|---|---|---|
| committer | marinofaggiana <marino@marinofaggiana.com> | 2020-07-01 16:19:12 +0300 |
| commit | 9aa72579e4f4ae446459de32f22c07d2ca07b9ef (patch) | |
| tree | b202419f73147d99c5ec9aba2484fc0f265251b9 /Carthage | |
| parent | b130ddc30e817e6cbdd63b7e162329dba1895c20 (diff) | |
coding
Diffstat (limited to 'Carthage')
40 files changed, 264 insertions, 592 deletions
diff --git a/Carthage/Checkouts/realm-cocoa/.jenkins.yml b/Carthage/Checkouts/realm-cocoa/.jenkins.yml index 87d8d4fc9..df5a470b9 100644 --- a/Carthage/Checkouts/realm-cocoa/.jenkins.yml +++ b/Carthage/Checkouts/realm-cocoa/.jenkins.yml @@ -4,12 +4,10 @@ # This is a generated file produced by scripts/pr-ci-matrix.rb. xcode_version: - - 10.3 - - 11.1 - - 11.2.1 - 11.3 - 11.4.1 - 11.5 + - 12.0 target: - docs - swiftlint @@ -40,30 +38,6 @@ configuration: exclude: - - xcode_version: 10.3 - target: docs - configuration: Debug - - - xcode_version: 10.3 - target: docs - configuration: Release - - - xcode_version: 11.1 - target: docs - configuration: Debug - - - xcode_version: 11.1 - target: docs - configuration: Release - - - xcode_version: 11.2.1 - target: docs - configuration: Debug - - - xcode_version: 11.2.1 - target: docs - configuration: Release - - xcode_version: 11.3 target: docs configuration: Debug @@ -84,30 +58,14 @@ exclude: target: docs configuration: Debug - - xcode_version: 10.3 - target: swiftlint - configuration: Debug - - - xcode_version: 10.3 - target: swiftlint - configuration: Release - - - xcode_version: 11.1 - target: swiftlint - configuration: Debug - - - xcode_version: 11.1 - target: swiftlint + - xcode_version: 11.5 + target: docs configuration: Release - - xcode_version: 11.2.1 - target: swiftlint + - xcode_version: 12.0 + target: docs configuration: Debug - - xcode_version: 11.2.1 - target: swiftlint - configuration: Release - - xcode_version: 11.3 target: swiftlint configuration: Debug @@ -128,34 +86,18 @@ exclude: target: swiftlint configuration: Debug - - xcode_version: 10.3 - target: osx-encryption - configuration: Debug - - - xcode_version: 11.1 - target: osx-encryption - configuration: Debug - - - xcode_version: 11.1 - target: osx-encryption + - xcode_version: 11.5 + target: swiftlint configuration: Release - - xcode_version: 11.2.1 - target: osx-encryption + - xcode_version: 12.0 + target: swiftlint configuration: Debug - - xcode_version: 11.2.1 - target: osx-encryption - configuration: Release - - xcode_version: 11.3 target: osx-encryption configuration: Debug - - xcode_version: 11.3 - target: osx-encryption - configuration: Release - - xcode_version: 11.4.1 target: osx-encryption configuration: Debug @@ -168,34 +110,18 @@ exclude: target: osx-encryption configuration: Debug - - xcode_version: 10.3 - target: osx-object-server - configuration: Debug - - - xcode_version: 11.1 - target: osx-object-server - configuration: Debug - - - xcode_version: 11.1 - target: osx-object-server + - xcode_version: 11.5 + target: osx-encryption configuration: Release - - xcode_version: 11.2.1 - target: osx-object-server + - xcode_version: 12.0 + target: osx-encryption configuration: Debug - - xcode_version: 11.2.1 - target: osx-object-server - configuration: Release - - xcode_version: 11.3 target: osx-object-server configuration: Debug - - xcode_version: 11.3 - target: osx-object-server - configuration: Release - - xcode_version: 11.4.1 target: osx-object-server configuration: Debug @@ -208,34 +134,18 @@ exclude: target: osx-object-server configuration: Debug - - xcode_version: 10.3 - target: ios-static - configuration: Debug - - - xcode_version: 11.1 - target: ios-static - configuration: Debug - - - xcode_version: 11.1 - target: ios-static + - xcode_version: 11.5 + target: osx-object-server configuration: Release - - xcode_version: 11.2.1 - target: ios-static + - xcode_version: 12.0 + target: osx-object-server configuration: Debug - - xcode_version: 11.2.1 - target: ios-static - configuration: Release - - xcode_version: 11.3 target: ios-static configuration: Debug - - xcode_version: 11.3 - target: ios-static - configuration: Release - - xcode_version: 11.4.1 target: ios-static configuration: Debug @@ -248,34 +158,18 @@ exclude: target: ios-static configuration: Debug - - xcode_version: 10.3 - target: ios-dynamic - configuration: Debug - - - xcode_version: 11.1 - target: ios-dynamic - configuration: Debug - - - xcode_version: 11.1 - target: ios-dynamic + - xcode_version: 11.5 + target: ios-static configuration: Release - - xcode_version: 11.2.1 - target: ios-dynamic + - xcode_version: 12.0 + target: ios-static configuration: Debug - - xcode_version: 11.2.1 - target: ios-dynamic - configuration: Release - - xcode_version: 11.3 target: ios-dynamic configuration: Debug - - xcode_version: 11.3 - target: ios-dynamic - configuration: Release - - xcode_version: 11.4.1 target: ios-dynamic configuration: Debug @@ -288,34 +182,18 @@ exclude: target: ios-dynamic configuration: Debug - - xcode_version: 10.3 - target: watchos - configuration: Debug - - - xcode_version: 11.1 - target: watchos - configuration: Debug - - - xcode_version: 11.1 - target: watchos + - xcode_version: 11.5 + target: ios-dynamic configuration: Release - - xcode_version: 11.2.1 - target: watchos + - xcode_version: 12.0 + target: ios-dynamic configuration: Debug - - xcode_version: 11.2.1 - target: watchos - configuration: Release - - xcode_version: 11.3 target: watchos configuration: Debug - - xcode_version: 11.3 - target: watchos - configuration: Release - - xcode_version: 11.4.1 target: watchos configuration: Debug @@ -328,34 +206,18 @@ exclude: target: watchos configuration: Debug - - xcode_version: 10.3 - target: tvos - configuration: Debug - - - xcode_version: 11.1 - target: tvos - configuration: Debug - - - xcode_version: 11.1 - target: tvos + - xcode_version: 11.5 + target: watchos configuration: Release - - xcode_version: 11.2.1 - target: tvos + - xcode_version: 12.0 + target: watchos configuration: Debug - - xcode_version: 11.2.1 - target: tvos - configuration: Release - - xcode_version: 11.3 target: tvos configuration: Debug - - xcode_version: 11.3 - target: tvos - configuration: Release - - xcode_version: 11.4.1 target: tvos configuration: Debug @@ -368,34 +230,18 @@ exclude: target: tvos configuration: Debug - - xcode_version: 10.3 - target: ios-swift - configuration: Debug - - - xcode_version: 11.1 - target: ios-swift - configuration: Debug - - - xcode_version: 11.1 - target: ios-swift + - xcode_version: 11.5 + target: tvos configuration: Release - - xcode_version: 11.2.1 - target: ios-swift + - xcode_version: 12.0 + target: tvos configuration: Debug - - xcode_version: 11.2.1 - target: ios-swift - configuration: Release - - xcode_version: 11.3 target: ios-swift configuration: Debug - - xcode_version: 11.3 - target: ios-swift - configuration: Release - - xcode_version: 11.4.1 target: ios-swift configuration: Debug @@ -408,34 +254,18 @@ exclude: target: ios-swift configuration: Debug - - xcode_version: 10.3 - target: tvos-swift - configuration: Debug - - - xcode_version: 11.1 - target: tvos-swift - configuration: Debug - - - xcode_version: 11.1 - target: tvos-swift + - xcode_version: 11.5 + target: ios-swift configuration: Release - - xcode_version: 11.2.1 - target: tvos-swift + - xcode_version: 12.0 + target: ios-swift configuration: Debug - - xcode_version: 11.2.1 - target: tvos-swift - configuration: Release - - xcode_version: 11.3 target: tvos-swift configuration: Debug - - xcode_version: 11.3 - target: tvos-swift - configuration: Release - - xcode_version: 11.4.1 target: tvos-swift configuration: Debug @@ -448,44 +278,36 @@ exclude: target: tvos-swift configuration: Debug - - xcode_version: 10.3 - target: catalyst - configuration: Debug - - - xcode_version: 10.3 - target: catalyst + - xcode_version: 11.5 + target: tvos-swift configuration: Release - - xcode_version: 11.1 - target: catalyst + - xcode_version: 12.0 + target: tvos-swift configuration: Debug - - xcode_version: 11.2.1 + - xcode_version: 11.3 target: catalyst configuration: Debug - - xcode_version: 11.3 + - xcode_version: 11.4.1 target: catalyst configuration: Debug - xcode_version: 11.4.1 target: catalyst - configuration: Debug + configuration: Release - - xcode_version: 10.3 - target: catalyst-swift + - xcode_version: 11.5 + target: catalyst configuration: Debug - - xcode_version: 10.3 - target: catalyst-swift + - xcode_version: 11.5 + target: catalyst configuration: Release - - xcode_version: 11.1 - target: catalyst-swift - configuration: Debug - - - xcode_version: 11.2.1 - target: catalyst-swift + - xcode_version: 12.0 + target: catalyst configuration: Debug - xcode_version: 11.3 @@ -496,30 +318,22 @@ exclude: target: catalyst-swift configuration: Debug - - xcode_version: 10.3 - target: xcframework - configuration: Debug - - - xcode_version: 10.3 - target: xcframework + - xcode_version: 11.4.1 + target: catalyst-swift configuration: Release - - xcode_version: 11.1 - target: xcframework + - xcode_version: 11.5 + target: catalyst-swift configuration: Debug - - xcode_version: 11.1 - target: xcframework + - xcode_version: 11.5 + target: catalyst-swift configuration: Release - - xcode_version: 11.2.1 - target: xcframework + - xcode_version: 12.0 + target: catalyst-swift configuration: Debug - - xcode_version: 11.2.1 - target: xcframework - configuration: Release - - xcode_version: 11.3 target: xcframework configuration: Debug @@ -540,16 +354,12 @@ exclude: target: xcframework configuration: Debug - - xcode_version: 10.3 - target: cocoapods-osx - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-osx - configuration: Debug + - xcode_version: 11.5 + target: xcframework + configuration: Release - - xcode_version: 11.2.1 - target: cocoapods-osx + - xcode_version: 12.0 + target: xcframework configuration: Debug - xcode_version: 11.3 @@ -564,34 +374,14 @@ exclude: target: cocoapods-osx configuration: Debug - - xcode_version: 10.3 - target: cocoapods-ios - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-ios - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-ios - configuration: Release - - - xcode_version: 11.2.1 - target: cocoapods-ios + - xcode_version: 12.0 + target: cocoapods-osx configuration: Debug - - xcode_version: 11.2.1 - target: cocoapods-ios - configuration: Release - - xcode_version: 11.3 target: cocoapods-ios configuration: Debug - - xcode_version: 11.3 - target: cocoapods-ios - configuration: Release - - xcode_version: 11.4.1 target: cocoapods-ios configuration: Debug @@ -604,34 +394,18 @@ exclude: target: cocoapods-ios configuration: Debug - - xcode_version: 10.3 - target: cocoapods-ios-dynamic - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-ios-dynamic - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-ios-dynamic + - xcode_version: 11.5 + target: cocoapods-ios configuration: Release - - xcode_version: 11.2.1 - target: cocoapods-ios-dynamic + - xcode_version: 12.0 + target: cocoapods-ios configuration: Debug - - xcode_version: 11.2.1 - target: cocoapods-ios-dynamic - configuration: Release - - xcode_version: 11.3 target: cocoapods-ios-dynamic configuration: Debug - - xcode_version: 11.3 - target: cocoapods-ios-dynamic - configuration: Release - - xcode_version: 11.4.1 target: cocoapods-ios-dynamic configuration: Debug @@ -644,34 +418,18 @@ exclude: target: cocoapods-ios-dynamic configuration: Debug - - xcode_version: 10.3 - target: cocoapods-watchos - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-watchos - configuration: Debug - - - xcode_version: 11.1 - target: cocoapods-watchos + - xcode_version: 11.5 + target: cocoapods-ios-dynamic configuration: Release - - xcode_version: 11.2.1 - target: cocoapods-watchos + - xcode_version: 12.0 + target: cocoapods-ios-dynamic configuration: Debug - - xcode_version: 11.2.1 - target: cocoapods-watchos - configuration: Release - - xcode_version: 11.3 target: cocoapods-watchos configuration: Debug - - xcode_version: 11.3 - target: cocoapods-watchos - configuration: Release - - xcode_version: 11.4.1 target: cocoapods-watchos configuration: Debug @@ -684,20 +442,12 @@ exclude: target: cocoapods-watchos configuration: Debug - - xcode_version: 10.3 - target: swiftpm - configuration: Debug - - - xcode_version: 10.3 - target: swiftpm + - xcode_version: 11.5 + target: cocoapods-watchos configuration: Release - - xcode_version: 11.1 - target: swiftpm - configuration: Debug - - - xcode_version: 11.2.1 - target: swiftpm + - xcode_version: 12.0 + target: cocoapods-watchos configuration: Debug - xcode_version: 11.3 @@ -708,30 +458,22 @@ exclude: target: swiftpm configuration: Debug - - xcode_version: 10.3 - target: swiftpm-address - configuration: Debug - - - xcode_version: 10.3 - target: swiftpm-address + - xcode_version: 11.4.1 + target: swiftpm configuration: Release - - xcode_version: 11.1 - target: swiftpm-address + - xcode_version: 11.5 + target: swiftpm configuration: Debug - - xcode_version: 11.1 - target: swiftpm-address + - xcode_version: 11.5 + target: swiftpm configuration: Release - - xcode_version: 11.2.1 - target: swiftpm-address + - xcode_version: 12.0 + target: swiftpm configuration: Debug - - xcode_version: 11.2.1 - target: swiftpm-address - configuration: Release - - xcode_version: 11.3 target: swiftpm-address configuration: Debug @@ -752,30 +494,14 @@ exclude: target: swiftpm-address configuration: Debug - - xcode_version: 10.3 - target: swiftpm-thread - configuration: Debug - - - xcode_version: 10.3 - target: swiftpm-thread - configuration: Release - - - xcode_version: 11.1 - target: swiftpm-thread - configuration: Debug - - - xcode_version: 11.1 - target: swiftpm-thread + - xcode_version: 11.5 + target: swiftpm-address configuration: Release - - xcode_version: 11.2.1 - target: swiftpm-thread + - xcode_version: 12.0 + target: swiftpm-address configuration: Debug - - xcode_version: 11.2.1 - target: swiftpm-thread - configuration: Release - - xcode_version: 11.3 target: swiftpm-thread configuration: Debug @@ -796,46 +522,38 @@ exclude: target: swiftpm-thread configuration: Debug - - xcode_version: 10.3 - target: swiftpm-ios - configuration: Debug - - - xcode_version: 10.3 - target: swiftpm-ios + - xcode_version: 11.5 + target: swiftpm-thread configuration: Release - - xcode_version: 11.1 - target: swiftpm-ios + - xcode_version: 12.0 + target: swiftpm-thread configuration: Debug - - xcode_version: 11.1 - target: swiftpm-ios - configuration: Release - - - xcode_version: 11.2.1 + - xcode_version: 11.3 target: swiftpm-ios configuration: Debug - - xcode_version: 11.2.1 + - xcode_version: 11.3 target: swiftpm-ios configuration: Release - - xcode_version: 11.3 + - xcode_version: 11.4.1 target: swiftpm-ios configuration: Debug - - xcode_version: 11.3 + - xcode_version: 11.4.1 target: swiftpm-ios configuration: Release - - xcode_version: 11.4.1 + - xcode_version: 11.5 target: swiftpm-ios configuration: Debug - - xcode_version: 11.4.1 + - xcode_version: 11.5 target: swiftpm-ios configuration: Release - - xcode_version: 11.5 + - xcode_version: 12.0 target: swiftpm-ios configuration: Debug diff --git a/Carthage/Checkouts/realm-cocoa/CHANGELOG.md b/Carthage/Checkouts/realm-cocoa/CHANGELOG.md index 95e195dfb..8264dd7bf 100644 --- a/Carthage/Checkouts/realm-cocoa/CHANGELOG.md +++ b/Carthage/Checkouts/realm-cocoa/CHANGELOG.md @@ -1,3 +1,44 @@ +5.2.0 Release notes (2020-06-30) +============================================================= + +Xcode 11.3 and iOS 9 are now the minimum supported versions. + +### Enhancements + +* Add support for building with Xcode 12 beta 1. watchOS currently requires + removing x86_64 from the supported architectures. Support for the new 64-bit + watch simulator will come in a future release. + +### Fixed + +* Opening a Realm file in file format v6 (created by Realm Cocoa versions + between 2.4 and 2.10) would crash. (Since 5.0.0, [Core #3764](https://github.com/realm/realm-core/issues/3764)). +* Upgrading v9 (pre-5.0) Realm files would create a redundant search index for + primary key properties. This index would then be removed the next time the + Realm was opened, resulting in some extra i/o in the upgrade process. + (Since 5.0.0, [Core #3787](https://github.com/realm/realm-core/issues/3787)). +* Fixed a performance issue with upgrading v9 files with search indexes on + non-primary-key properties. (Since 5.0.0, [Core #3767](https://github.com/realm/realm-core/issues/3767)). +* `List.index(of:)` would give incorrect results if it was the very first thing + called on that List after a Realm was refreshed following a write which + modified the List. (Since 5.0.0, [#6606](https://github.com/realm/realm-cocoa/issues/6606)). +* If a ThreadSafeReference was the only remaining reference to a Realm, + multiple copies of the file could end up mapped into memory at once. This + probably did not have any symptoms other than increased memory usage. (Since 5.0.0). + +### 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.5. + +### Internal + +* Upgraded realm-core from v6.0.6 to v6.0.8 +* Upgraded realm-sync from v5.0.5 to v5.0.7 + 5.1.0 Release notes (2020-06-22) ============================================================= diff --git a/Carthage/Checkouts/realm-cocoa/Configuration/Base.xcconfig b/Carthage/Checkouts/realm-cocoa/Configuration/Base.xcconfig index 89ac3a2a3..3fb5ef703 100644 --- a/Carthage/Checkouts/realm-cocoa/Configuration/Base.xcconfig +++ b/Carthage/Checkouts/realm-cocoa/Configuration/Base.xcconfig @@ -24,6 +24,7 @@ CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; +CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; COMBINE_HIDPI_IMAGES = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -57,10 +58,12 @@ CODE_SIGN_IDENTITY[sdk=iphone*] = iPhone Developer; CODE_SIGNING_REQUIRED[sdk=macosx] = NO; MACOSX_DEPLOYMENT_TARGET = 10.9; -IPHONEOS_DEPLOYMENT_TARGET = 8.0; +IPHONEOS_DEPLOYMENT_TARGET = 9.0; WATCHOS_DEPLOYMENT_TARGET = 2.0; TVOS_DEPLOYMENT_TARGET = 9.0; -SWIFT_VERSION = 4.0; +VALID_ARCHS[sdk=watchsimulator*] = i386; + +SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1,2,3,4; SDKROOT = $(REALM_SDKROOT); diff --git a/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Realm iOS static.xcconfig b/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Realm iOS static.xcconfig index 8dbe058bb..bada4105a 100644 --- a/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Realm iOS static.xcconfig +++ b/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Realm iOS static.xcconfig @@ -2,7 +2,7 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator; TARGETED_DEVICE_FAMILY = 1,2; -IPHONEOS_DEPLOYMENT_TARGET = 8.0; +IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACH_O_TYPE = staticlib; EXECUTABLE_NAME = Realm; diff --git a/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Tests iOS static.xcconfig b/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Tests iOS static.xcconfig index c9351017a..85cf7cc94 100644 --- a/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Tests iOS static.xcconfig +++ b/Carthage/Checkouts/realm-cocoa/Configuration/Realm/Tests iOS static.xcconfig @@ -2,6 +2,6 @@ CONFIGURATION_BUILD_DIR = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)-static; CONFIGURATION_TEMP_DIR = $(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)-static; -IPHONEOS_DEPLOYMENT_TARGET = 8.0; +IPHONEOS_DEPLOYMENT_TARGET = 9.0; TEST_HOST[sdk=iphone*] = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)-static/TestHost static.app/TestHost static; diff --git a/Carthage/Checkouts/realm-cocoa/Configuration/TestHost.xcconfig b/Carthage/Checkouts/realm-cocoa/Configuration/TestHost.xcconfig index c8cc93fc3..3042edff3 100644 --- a/Carthage/Checkouts/realm-cocoa/Configuration/TestHost.xcconfig +++ b/Carthage/Checkouts/realm-cocoa/Configuration/TestHost.xcconfig @@ -22,4 +22,4 @@ PRINCIPAL_CLASS[sdk=iphone*] = UIApplication; PRINCIPAL_CLASS[sdk=appletv*] = UIApplication; PRINCIPAL_CLASS[sdk=macosx*] = NSApplication; -IPHONEOS_DEPLOYMENT_TARGET = 8.0; +IPHONEOS_DEPLOYMENT_TARGET = 9.0; diff --git a/Carthage/Checkouts/realm-cocoa/Jenkinsfile.releasability b/Carthage/Checkouts/realm-cocoa/Jenkinsfile.releasability index 05ef51cff..cd77baf83 100644 --- a/Carthage/Checkouts/realm-cocoa/Jenkinsfile.releasability +++ b/Carthage/Checkouts/realm-cocoa/Jenkinsfile.releasability @@ -1,9 +1,9 @@ -xcodeVersions = ['10.3', '11.1', '11.2.1', '11.3', '11.4.1', '11.5'] +xcodeVersions = ['11.3', '11.4.1', '11.5'] platforms = ['osx', 'ios', 'watchos', 'tvos', 'catalyst'] carthagePlatforms = ['osx', 'ios', 'watchos', 'tvos'] platformNames = ['osx': 'macOS', 'ios': 'iOS', 'watchos': 'watchOS', 'tvos': 'tvOS', 'catalyst': 'Catalyst'] carthageXcodeVersion = '11.5' -objcXcodeVersion = '10.3' +objcXcodeVersion = '11.3' docsSwiftVersion = '5.2.4' def installationTest(platform, test, language) { @@ -163,11 +163,6 @@ def doBuild() { unstash "${platform}-${objcXcodeVersion}" } - // The 10.x builds don't actually have a framework for catalyst, so - // use the 11.0 version instead - unstash 'catalyst-11.1' - sh "mv realm-framework-catalyst-11.1.zip realm-framework-catalyst-${objcXcodeVersion}.zip" - unstash 'ios-static' unstash 'examples' unstash 'source' diff --git a/Carthage/Checkouts/realm-cocoa/Realm.podspec b/Carthage/Checkouts/realm-cocoa/Realm.podspec index f1d9b2eee..df15d2694 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm.podspec +++ b/Carthage/Checkouts/realm-cocoa/Realm.podspec @@ -95,7 +95,7 @@ Pod::Spec.new do |s| } s.preserve_paths = %w(build.sh include) - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.ios.vendored_library = 'core/librealmcore-ios.a' s.osx.deployment_target = '10.9' diff --git a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/CMake/RealmCore.cmake b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/CMake/RealmCore.cmake index 5b0607600..1c440e340 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/CMake/RealmCore.cmake +++ b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/CMake/RealmCore.cmake @@ -200,7 +200,7 @@ function(download_realm_core core_version) set_property(TARGET realm PROPERTY IMPORTED_LOCATION_RELEASE ${core_library_release}) set_property(TARGET realm PROPERTY IMPORTED_LOCATION ${core_library_release}) - set_property(TARGET realm PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads ${CRYPTO_LIBRARIES}) + set_property(TARGET realm PROPERTY INTERFACE_LINK_LIBRARIES ${CRYPTO_LIBRARIES} Threads::Threads) # Create directories that are included in INTERFACE_INCLUDE_DIRECTORIES, as CMake requires they exist at # configure time, when they'd otherwise not be created until we download and extract core. @@ -223,8 +223,8 @@ macro(build_realm_core) BUILD_IN_SOURCE 1 UPDATE_DISCONNECTED 1 INSTALL_COMMAND "" - CONFIGURE_COMMAND cmake -B build.debug -DOpenSSL_DIR="${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL" -D CMAKE_BUILD_TYPE=Debug ${CORE_SANITIZER_FLAGS} -G Ninja - && cmake -B build.release -DOpenSSL_DIR="${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL" -D CMAKE_BUILD_TYPE=RelWithDebInfo ${CORE_SANITIZER_FLAGS} -G Ninja + CONFIGURE_COMMAND cmake -B build.debug -DOpenSSL_DIR=${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL -D CMAKE_BUILD_TYPE=Debug ${CORE_SANITIZER_FLAGS} -G Ninja + && cmake -B build.release -DOpenSSL_DIR=${CMAKE_BINARY_DIR}/openssl/lib/cmake/OpenSSL -D CMAKE_BUILD_TYPE=RelWithDebInfo ${CORE_SANITIZER_FLAGS} -G Ninja BUILD_COMMAND cmake --build build.debug --target Storage --target QueryParser && cmake --build build.release --target Storage --target QueryParser diff --git a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.cpp b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.cpp index b335e650a..80c6ec313 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.cpp +++ b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.cpp @@ -24,6 +24,8 @@ #include "results.hpp" #include "shared_realm.hpp" +#include "impl/realm_coordinator.hpp" + #include <realm/db.hpp> #include <realm/keys.hpp> @@ -33,6 +35,7 @@ public: virtual ~Payload() = default; Payload(Realm& realm) : m_transaction(realm.is_in_read_transaction() ? realm.duplicate() : nullptr) + , m_coordinator(Realm::Internal::get_coordinator(realm).shared_from_this()) , m_created_in_write_transaction(realm.is_in_transaction()) { } @@ -43,7 +46,7 @@ protected: const TransactionRef m_transaction; private: - const VersionID m_target_version; + const std::shared_ptr<_impl::RealmCoordinator> m_coordinator; const bool m_created_in_write_transaction; }; diff --git a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.hpp b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.hpp index 326a2a703..7dba87f5e 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.hpp +++ b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/src/thread_safe_reference.hpp @@ -51,6 +51,9 @@ private: template<typename> class PayloadImpl; std::unique_ptr<Payload> m_payload; }; + +template<> ThreadSafeReference::ThreadSafeReference(std::shared_ptr<Realm> const&); +template<> std::shared_ptr<Realm> ThreadSafeReference::resolve(std::shared_ptr<Realm> const&); } #endif /* REALM_OS_THREAD_SAFE_REFERENCE_HPP */ diff --git a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/tests/thread_safe_reference.cpp b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/tests/thread_safe_reference.cpp index 507b91e34..2594e3a12 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/tests/thread_safe_reference.cpp +++ b/Carthage/Checkouts/realm-cocoa/Realm/ObjectStore/tests/thread_safe_reference.cpp @@ -31,6 +31,7 @@ #include "util/scheduler.hpp" #include "impl/object_accessor_impl.hpp" +#include "impl/realm_coordinator.hpp" #include <realm/db.hpp> #include <realm/history.hpp> @@ -858,10 +859,19 @@ TEST_CASE("thread safe reference") { SECTION("lifetime") { SECTION("retains source realm") { // else version will become unpinned auto ref = ThreadSafeReference(foo); + foo = {}; r = nullptr; r = Realm::get_shared_realm(config); REQUIRE_NOTHROW(ref.resolve<Object>(r)); } + + SECTION("retains source RealmCoordinator") { + auto ref = ThreadSafeReference(foo); + auto coordinator = _impl::RealmCoordinator::get_existing_coordinator(config.path).get(); + foo = {}; + r = nullptr; + REQUIRE(coordinator == _impl::RealmCoordinator::get_existing_coordinator(config.path).get()); + } } SECTION("metadata") { diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm+Sync.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm+Sync.h index 42f161655..e459bfc52 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm+Sync.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm+Sync.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import "RLMRealm.h" +#import <Realm/RLMRealm.h> @class RLMResults, RLMSyncSession; diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm.h index 17595d142..f3a476b99 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMRealm.h @@ -17,7 +17,7 @@ //////////////////////////////////////////////////////////////////////////// #import <Foundation/Foundation.h> -#import "RLMConstants.h" +#import <Realm/RLMConstants.h> @class RLMRealmConfiguration, RLMRealm, RLMObject, RLMSchema, RLMMigration, RLMNotificationToken, RLMThreadSafeReference, RLMAsyncOpenTask; struct RLMRealmPrivileges; diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMRealmConfiguration+Sync.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMRealmConfiguration+Sync.h index abd51bf59..a8392b20d 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMRealmConfiguration+Sync.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMRealmConfiguration+Sync.h @@ -18,7 +18,7 @@ #import <Realm/RLMRealmConfiguration.h> -#import "RLMSyncUtil.h" +#import <Realm/RLMSyncUtil.h> @class RLMSyncConfiguration; diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncCredentials.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncCredentials.h index 6c99ce596..deb28aade 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncCredentials.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncCredentials.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import "RLMSyncUtil.h" +#import <Realm/RLMSyncUtil.h> NS_ASSUME_NONNULL_BEGIN diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncManager.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncManager.h index debb5d4a4..9637f771e 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncManager.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncManager.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import "RLMSyncUtil.h" +#import <Realm/RLMSyncUtil.h> @class RLMSyncSession, RLMSyncTimeoutOptions; diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncSession.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncSession.h index 3b26184f5..cc66103d9 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncSession.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncSession.h @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> -#import "RLMRealm.h" +#import <Realm/RLMRealm.h> /** The current state of the session represented by a session object. diff --git a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncUser.h b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncUser.h index d871490f6..02e29e5ad 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncUser.h +++ b/Carthage/Checkouts/realm-cocoa/Realm/RLMSyncUser.h @@ -18,9 +18,9 @@ #import <Foundation/Foundation.h> -#import "RLMRealmConfiguration.h" -#import "RLMSyncCredentials.h" -#import "RLMSyncPermission.h" +#import <Realm/RLMRealmConfiguration.h> +#import <Realm/RLMSyncCredentials.h> +#import <Realm/RLMSyncPermission.h> @class RLMSyncUser, RLMSyncUserInfo, RLMSyncCredentials, RLMSyncPermission, RLMSyncSession, RLMRealm, RLMSyncPermissionOffer; diff --git a/Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist b/Carthage/Checkouts/realm-cocoa/Realm/Realm-Info.plist index 86e830a2e..9b175f919 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.1.0</string> + <string>5.2.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>5.1.0</string> + <string>5.2.0</string> <key>NSHumanReadableCopyright</key> <string>Copyright © 2014 Realm. All rights reserved.</string> <key>NSPrincipalClass</key> diff --git a/Carthage/Checkouts/realm-cocoa/Realm/Tests/KVOTests.mm b/Carthage/Checkouts/realm-cocoa/Realm/Tests/KVOTests.mm index 808c15331..887072761 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/Tests/KVOTests.mm +++ b/Carthage/Checkouts/realm-cocoa/Realm/Tests/KVOTests.mm @@ -233,6 +233,7 @@ public: XCTFail(@"%@", e.description); } XCTAssertEqual(0U, _notifications.count); + static_cast<void>(self); // Pre-12 versions of Xcode require the self variable but 12 doesn't use it } // record a single notification @@ -241,6 +242,7 @@ public: XCTAssertEqual(obj, _obj); XCTAssertEqualObjects(key, _keyPath); [_notifications addObject:changeDictionary.copy]; + static_cast<void>(self); // Pre-12 versions of Xcode require the self variable but 12 doesn't use it } // ensure that the observed object is updated for any changes made to the diff --git a/Carthage/Checkouts/realm-cocoa/Realm/Tests/MigrationTests.mm b/Carthage/Checkouts/realm-cocoa/Realm/Tests/MigrationTests.mm index d11d31388..9090f1f67 100644 --- a/Carthage/Checkouts/realm-cocoa/Realm/Tests/MigrationTests.mm +++ b/Carthage/Checkouts/realm-cocoa/Realm/Tests/MigrationTests.mm @@ -50,6 +50,7 @@ static void RLMAssertRealmSchemaMatchesTable(id self, RLMRealm *realm) { XCTAssertEqual(indexed, table->has_search_index(column)); } } + static_cast<void>(self); } @interface MigrationTestObject : RLMObject diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift.podspec b/Carthage/Checkouts/realm-cocoa/RealmSwift.podspec index f8db6bd7c..c8a6b28dc 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift.podspec +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift.podspec @@ -26,7 +26,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' } - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.9' s.watchos.deployment_target = '2.0' s.tvos.deployment_target = '9.0' diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/List.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/List.swift index f7c4eb422..69056611b 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/List.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/List.swift @@ -527,11 +527,7 @@ extension List: RealmCollection { // MARK: - MutableCollection conformance, range replaceable collection emulation extension List: MutableCollection { -#if swift(>=4.1) public typealias SubSequence = Slice<List> -#else - public typealias SubSequence = RandomAccessSlice<List> -#endif /** Returns the objects at the given range (get), or replaces the objects at the @@ -598,7 +594,6 @@ extension List: MutableCollection { currentIndex += 1 } } - #if swift(>=4.1.50) /** Removes objects from the list at the given range. @@ -610,69 +605,6 @@ extension List: MutableCollection { remove(at: bounds.lowerBound) } } - #else - /** - Removes objects from the list at the given range. - - - warning: This method may only be called during a write transaction. - */ - public func removeSubrange(_ bounds: Range<Int>) { - removeSubrange(bounds.lowerBound..<bounds.upperBound) - } - - /// :nodoc: - public func removeSubrange(_ bounds: ClosedRange<Int>) { - removeSubrange(bounds.lowerBound...bounds.upperBound) - } - - /// :nodoc: - public func removeSubrange(_ bounds: CountableRange<Int>) { - for _ in bounds { - remove(at: bounds.lowerBound) - } - } - - /// :nodoc: - public func removeSubrange(_ bounds: CountableClosedRange<Int>) { - for _ in bounds { - remove(at: bounds.lowerBound) - } - } - - /// :nodoc: - public func removeSubrange(_ bounds: DefaultRandomAccessIndices<List>) { - removeSubrange(bounds.startIndex..<bounds.endIndex) - } - - /// :nodoc: - public func replaceSubrange<C: Collection>(_ subrange: ClosedRange<Int>, with newElements: C) - where C.Iterator.Element == Element { - removeSubrange(subrange) - insert(contentsOf: newElements, at: subrange.lowerBound) - } - - /// :nodoc: - public func replaceSubrange<C: Collection>(_ subrange: CountableRange<Int>, with newElements: C) - where C.Iterator.Element == Element { - removeSubrange(subrange) - insert(contentsOf: newElements, at: subrange.lowerBound) - } - - /// :nodoc: - public func replaceSubrange<C: Collection>(_ subrange: CountableClosedRange<Int>, with newElements: C) - where C.Iterator.Element == Element { - removeSubrange(subrange) - insert(contentsOf: newElements, at: subrange.lowerBound) - } - - - /// :nodoc: - public func replaceSubrange<C: Collection>(_ subrange: DefaultRandomAccessIndices<List>, with newElements: C) - where C.Iterator.Element == Element { - removeSubrange(subrange) - insert(contentsOf: newElements, at: subrange.startIndex) - } -#endif /// :nodoc: public func remove(atOffsets offsets: IndexSet) { for offset in offsets.reversed() { @@ -700,7 +632,6 @@ extension List: MutableCollection { // MARK: - Codable -#if swift(>=4.1) extension List: Decodable where Element: Decodable { public convenience init(from decoder: Decoder) throws { self.init() @@ -719,7 +650,6 @@ extension List: Encodable where Element: Encodable { } } } -#endif // MARK: - AssistedObjectiveCBridgeable diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Optional.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Optional.swift index ec0b571dd..3161591cb 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Optional.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Optional.swift @@ -65,7 +65,6 @@ public final class RealmOptional<Value: RealmOptionalType>: RLMOptionalBase { } } -#if swift(>=4.1) extension RealmOptional: Codable where Value: Codable { public convenience init(from decoder: Decoder) throws { self.init() @@ -79,7 +78,6 @@ extension RealmOptional: Codable where Value: Codable { try self.value.encode(to: encoder) } } -#endif internal protocol RealmOptionalProtocol { } extension RealmOptional: RealmOptionalProtocol { } diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift index e97ebc8d7..d5b1589ea 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/RealmConfiguration.swift @@ -20,14 +20,6 @@ import Foundation import Realm import Realm.Private -#if !swift(>=4.1) -fileprivate extension Sequence { - func compactMap<T>(_ fn: (Self.Iterator.Element) throws -> T?) rethrows -> [T] { - return try flatMap(fn) - } -} -#endif - extension Realm { /** A `Configuration` instance describes the different options used to create an instance of a Realm. diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Results.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Results.swift index 6827a2407..1e7f65687 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Results.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Results.swift @@ -413,7 +413,6 @@ extension Results: AssistedObjectiveCBridgeable { // MARK: - Codable -#if swift(>=4.1) extension Results: Encodable where Element: Encodable { public func encode(to encoder: Encoder) throws { var container = encoder.unkeyedContainer() @@ -422,4 +421,3 @@ extension Results: Encodable where Element: Encodable { } } } -#endif diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/KVOTests.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/KVOTests.swift index eb781c339..5c7c8bf77 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/KVOTests.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/KVOTests.swift @@ -107,7 +107,7 @@ class KVOTests: TestCase { block() obj.removeObserver(self, forKeyPath: key) - XCTAssert(changeDictionary != nil, "Did not get a notification", file: fileName, line: lineNumber) + XCTAssert(changeDictionary != nil, "Did not get a notification", file: (fileName), line: lineNumber) guard changeDictionary != nil else { return } let actualOld = changeDictionary![.oldKey]! as? T @@ -115,10 +115,10 @@ class KVOTests: TestCase { XCTAssert(old == actualOld, "Old value: expected \(String(describing: old)), got \(String(describing: actualOld))", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) XCTAssert(new == actualNew, "New value: expected \(String(describing: new)), got \(String(describing: actualNew))", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) changeDictionary = nil } @@ -128,15 +128,15 @@ class KVOTests: TestCase { let kvoOptions: NSKeyValueObservingOptions = [.old, .new] var gotNotification = false let observation = obj.observe(keyPath, options: kvoOptions) { _, change in - XCTAssertEqual(change.oldValue, old, file: fileName, line: lineNumber) - XCTAssertEqual(change.newValue, new, file: fileName, line: lineNumber) + XCTAssertEqual(change.oldValue, old, file: (fileName), line: lineNumber) + XCTAssertEqual(change.newValue, new, file: (fileName), line: lineNumber) gotNotification = true } block() observation.invalidate() - XCTAssertTrue(gotNotification, file: fileName, line: lineNumber) + XCTAssertTrue(gotNotification, file: (fileName), line: lineNumber) } func observeChange<T: Equatable>(_ obj: SwiftKVOObject, _ keyPath: KeyPath<SwiftKVOObject, T?>, _ old: T?, _ new: T?, @@ -145,14 +145,14 @@ class KVOTests: TestCase { var gotNotification = false let observation = obj.observe(keyPath, options: kvoOptions) { _, change in if let oldValue = change.oldValue { - XCTAssertEqual(oldValue, old, file: fileName, line: lineNumber) + XCTAssertEqual(oldValue, old, file: (fileName), line: lineNumber) } else { - XCTAssertNil(old, file: fileName, line: lineNumber) + XCTAssertNil(old, file: (fileName), line: lineNumber) } if let newValue = change.newValue { - XCTAssertEqual(newValue, new, file: fileName, line: lineNumber) + XCTAssertEqual(newValue, new, file: (fileName), line: lineNumber) } else { - XCTAssertNil(new, file: fileName, line: lineNumber) + XCTAssertNil(new, file: (fileName), line: lineNumber) } gotNotification = true } @@ -160,7 +160,7 @@ class KVOTests: TestCase { block() observation.invalidate() - XCTAssertTrue(gotNotification, file: fileName, line: lineNumber) + XCTAssertTrue(gotNotification, file: (fileName), line: lineNumber) } func observeListChange(_ obj: NSObject, _ key: String, _ kind: NSKeyValueChange, _ indexes: NSIndexSet = NSIndexSet(index: 0), @@ -168,15 +168,15 @@ class KVOTests: TestCase { obj.addObserver(self, forKeyPath: key, options: [.old, .new], context: nil) block() obj.removeObserver(self, forKeyPath: key) - XCTAssert(changeDictionary != nil, "Did not get a notification", file: fileName, line: lineNumber) + XCTAssert(changeDictionary != nil, "Did not get a notification", file: (fileName), line: lineNumber) guard changeDictionary != nil else { return } let actualKind = NSKeyValueChange(rawValue: (changeDictionary![NSKeyValueChangeKey.kindKey] as! NSNumber).uintValue)! let actualIndexes = changeDictionary![NSKeyValueChangeKey.indexesKey]! as! NSIndexSet - XCTAssert(actualKind == kind, "Change kind: expected \(kind), got \(actualKind)", file: fileName, + XCTAssert(actualKind == kind, "Change kind: expected \(kind), got \(actualKind)", file: (fileName), line: lineNumber) XCTAssert(actualIndexes.isEqual(indexes), "Changed indexes: expected \(indexes), got \(actualIndexes)", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) changeDictionary = nil } diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/ListTests.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/ListTests.swift index c9e1a8d61..34af40866 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/ListTests.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/ListTests.swift @@ -19,14 +19,6 @@ import XCTest import RealmSwift -#if !swift(>=4.1) -extension Sequence { - func compactMap<ElementOfResult>(_ transform: (Self.Element) throws -> ElementOfResult?) rethrows -> [ElementOfResult] { - return try flatMap(transform) - } -} -#endif - class ListTests: TestCase { var str1: SwiftStringObject? var str2: SwiftStringObject? @@ -204,8 +196,8 @@ class ListTests: TestCase { assertEqual(str2, array[0]) assertEqual(str1, array[1]) - assertThrows(_ = array.insert(str2, at: 200)) - assertThrows(_ = array.insert(str2, at: -200)) + assertThrows(array.insert(str2, at: 200)) + assertThrows(array.insert(str2, at: -200)) } func testRemoveAtIndex() { diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/PrimitiveListTests.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/PrimitiveListTests.swift index c740d9ca5..2f36efe49 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/PrimitiveListTests.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/PrimitiveListTests.swift @@ -381,8 +381,8 @@ class PrimitiveListTests<O: ObjectFactory, V: ValueFactory>: PrimitiveListTestsB XCTAssertEqual(values[0], array[1]) XCTAssertEqual(values[2], array[2]) - assertThrows(_ = array.insert(values[0], at: 4)) - assertThrows(_ = array.insert(values[0], at: -1)) + assertThrows(array.insert(values[0], at: 4)) + assertThrows(array.insert(values[0], at: -1)) } func testRemove() { diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/RealmTests.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/RealmTests.swift index 908f2e97f..feb3da89a 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/RealmTests.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/RealmTests.swift @@ -315,7 +315,7 @@ class RealmTests: TestCase { func testAddSingleObject() { let realm = try! Realm() - assertThrows(_ = realm.add(SwiftObject())) + assertThrows(realm.add(SwiftObject())) XCTAssertEqual(0, realm.objects(SwiftObject.self).count) var defaultRealmObject: SwiftObject! try! realm.write { @@ -329,7 +329,7 @@ class RealmTests: TestCase { let testRealm = realmWithTestPath() try! testRealm.write { - self.assertThrows(_ = testRealm.add(defaultRealmObject)) + self.assertThrows(testRealm.add(defaultRealmObject)) } } @@ -348,13 +348,13 @@ class RealmTests: TestCase { let testRealm = realmWithTestPath() try! testRealm.write { - self.assertThrows(_ = testRealm.add(defaultRealmObject, update: .all)) + self.assertThrows(testRealm.add(defaultRealmObject, update: .all)) } } func testAddMultipleObjects() { let realm = try! Realm() - assertThrows(_ = realm.add([SwiftObject(), SwiftObject()])) + assertThrows(realm.add([SwiftObject(), SwiftObject()])) XCTAssertEqual(0, realm.objects(SwiftObject.self).count) try! realm.write { let objs = [SwiftObject(), SwiftObject()] @@ -365,7 +365,7 @@ class RealmTests: TestCase { let testRealm = realmWithTestPath() try! testRealm.write { - self.assertThrows(_ = testRealm.add(realm.objects(SwiftObject.self))) + self.assertThrows(testRealm.add(realm.objects(SwiftObject.self))) } } @@ -381,7 +381,7 @@ class RealmTests: TestCase { let testRealm = realmWithTestPath() try! testRealm.write { - self.assertThrows(_ = testRealm.add(realm.objects(SwiftPrimaryStringObject.self), update: .all)) + self.assertThrows(testRealm.add(realm.objects(SwiftPrimaryStringObject.self), update: .all)) } } @@ -390,24 +390,24 @@ class RealmTests: TestCase { func testDeleteSingleObject() { let realm = try! Realm() XCTAssertEqual(0, realm.objects(SwiftObject.self).count) - assertThrows(_ = realm.delete(SwiftObject())) + assertThrows(realm.delete(SwiftObject())) var defaultRealmObject: SwiftObject! try! realm.write { defaultRealmObject = SwiftObject() - self.assertThrows(_ = realm.delete(defaultRealmObject)) + self.assertThrows(realm.delete(defaultRealmObject)) XCTAssertEqual(0, realm.objects(SwiftObject.self).count) realm.add(defaultRealmObject) XCTAssertEqual(1, realm.objects(SwiftObject.self).count) realm.delete(defaultRealmObject) XCTAssertEqual(0, realm.objects(SwiftObject.self).count) } - assertThrows(_ = realm.delete(defaultRealmObject)) + assertThrows(realm.delete(defaultRealmObject)) XCTAssertEqual(0, realm.objects(SwiftObject.self).count) let testRealm = realmWithTestPath() - assertThrows(_ = testRealm.delete(defaultRealmObject)) + assertThrows(testRealm.delete(defaultRealmObject)) try! testRealm.write { - self.assertThrows(_ = testRealm.delete(defaultRealmObject)) + self.assertThrows(testRealm.delete(defaultRealmObject)) } } @@ -425,9 +425,9 @@ class RealmTests: TestCase { XCTAssertEqual(0, realm.objects(SwiftObject.self).count) let testRealm = realmWithTestPath() - assertThrows(_ = testRealm.delete(objs)) + assertThrows(testRealm.delete(objs)) try! testRealm.write { - self.assertThrows(_ = testRealm.delete(objs)) + self.assertThrows(testRealm.delete(objs)) } } diff --git a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/TestCase.swift b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/TestCase.swift index e1aef2fd7..5d36fe318 100644 --- a/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/TestCase.swift +++ b/Carthage/Checkouts/realm-cocoa/RealmSwift/Tests/TestCase.swift @@ -104,13 +104,13 @@ class TestCase: RLMTestCaseBase { return } XCTFail("Objects expected to be equal, but weren't. First: \(String(describing: o1)), " - + "second: \(String(describing: o2))", file: fileName, line: lineNumber) + + "second: \(String(describing: o2))", file: (fileName), line: lineNumber) } /// Check whether two collections containing Realm objects are equal. func assertEqual<C: Collection>(_ c1: C, _ c2: C, fileName: StaticString = #file, lineNumber: UInt = #line) where C.Iterator.Element: Object { - XCTAssertEqual(c1.count, c2.count, "Collection counts were incorrect", file: fileName, line: lineNumber) + XCTAssertEqual(c1.count, c2.count, "Collection counts were incorrect", file: (fileName), line: lineNumber) for (o1, o2) in zip(c1, c2) { assertEqual(o1, o2, fileName: fileName, lineNumber: lineNumber) } @@ -119,14 +119,14 @@ class TestCase: RLMTestCaseBase { func assertEqual<T: Equatable>(_ expected: [T?], _ actual: [T?], file: StaticString = #file, line: UInt = #line) { if expected.count != actual.count { XCTFail("assertEqual failed: (\"\(expected)\") is not equal to (\"\(actual)\")", - file: file, line: line) + file: (file), line: line) return } - XCTAssertEqual(expected.count, actual.count, "Collection counts were incorrect", file: file, line: line) + XCTAssertEqual(expected.count, actual.count, "Collection counts were incorrect", file: (file), line: line) for (e, a) in zip(expected, actual) where e != a { XCTFail("assertEqual failed: (\"\(expected)\") is not equal to (\"\(actual)\")", - file: file, line: line) + file: (file), line: line) return } } @@ -155,7 +155,7 @@ class TestCase: RLMTestCaseBase { try block() } catch { XCTFail("Expected no error, but instead caught <\(error)>.", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) } } @@ -165,12 +165,12 @@ class TestCase: RLMTestCaseBase { do { _ = try block() XCTFail("Expected to catch <\(expectedError)>, but no error was thrown.", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) } catch let e as Realm.Error where e.code == expectedError { // Success! } catch { XCTFail("Expected to catch <\(expectedError)>, but instead caught <\(error)>.", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) } } @@ -180,18 +180,18 @@ class TestCase: RLMTestCaseBase { do { _ = try block() XCTFail("Expected to catch <\(expectedError)>, but no error was thrown.", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) } catch let e where e._code == expectedError._code { // Success! } catch { XCTFail("Expected to catch <\(expectedError)>, but instead caught <\(error)>.", - file: fileName, line: lineNumber) + file: (fileName), line: lineNumber) } } func assertNil<T>(block: @autoclosure() -> T?, _ message: String? = nil, fileName: StaticString = #file, lineNumber: UInt = #line) { - XCTAssert(block() == nil, message ?? "", file: fileName, line: lineNumber) + XCTAssert(block() == nil, message ?? "", file: (fileName), line: lineNumber) } func assertMatches(_ block: @autoclosure () -> String, _ regexString: String, _ message: String? = nil, diff --git a/Carthage/Checkouts/realm-cocoa/build.sh b/Carthage/Checkouts/realm-cocoa/build.sh index b6df3c7b8..f65bea368 100755 --- a/Carthage/Checkouts/realm-cocoa/build.sh +++ b/Carthage/Checkouts/realm-cocoa/build.sh @@ -363,6 +363,13 @@ download_common() { rm -rf "${download_type}-${version}" core mv "${temp_dir}/${download_type}-${version}" . ln -s "${download_type}-${version}" core + + # Xcode 12 beta 1 ships a broken version of __bit_reference which breaks + # ABI compatibility with older versions, so grab a fixed version of that + # header. + if (( $(xcode_version_major) > 11 )); then + curl --silent https://raw.githubusercontent.com/llvm/llvm-project/4198874630be5c6126d78944f8a2d89dea90c7c4/libcxx/include/__bit_reference -o core/include/__bit_reference + fi } download_core() { @@ -557,11 +564,6 @@ case "$COMMAND" in ;; "catalyst") - if (( $(xcode_version_major) < 11 )); then - echo 'Building for Catalyst requires Xcode 11' - exit 1 - fi - xc "-scheme Realm -configuration $CONFIGURATION \ REALM_CATALYST_FLAGS='-target x86_64-apple-ios13.0-macabi' \ REALM_PLATFORM_SUFFIX='maccatalyst' \ @@ -570,11 +572,6 @@ case "$COMMAND" in ;; "catalyst-swift") - if (( $(xcode_version_major) < 11 )); then - echo 'Building for Catalyst requires Xcode 11' - exit 1 - fi - sh build.sh catalyst # FIXME: change this to just "-destination variant='Mac Catalyst'" once the CI machines are running 10.15 xc "-scheme 'RealmSwift' -configuration $CONFIGURATION build \ @@ -590,11 +587,6 @@ case "$COMMAND" in ;; "xcframework") - if (( $(xcode_version_major) < 11 )); then - echo 'Building a xcframework requires Xcode 11' - exit 1 - fi - export REALM_EXTRA_BUILD_ARGUMENTS="$REALM_EXTRA_BUILD_ARGUMENTS BUILD_LIBRARY_FOR_DISTRIBUTION=YES REALM_OBJC_MACH_O_TYPE=staticlib" # Build all of the requested frameworks @@ -760,10 +752,8 @@ case "$COMMAND" in sh build.sh test-tvos-devices || failed=1 sh build.sh test-osx || failed=1 sh build.sh test-osx-swift || failed=1 - if (( $(xcode_version_major) >= 11 )); then - sh build.sh test-catalyst || failed=1 - sh build.sh test-catalyst-swift || failed=1 - fi + sh build.sh test-catalyst || failed=1 + sh build.sh test-catalyst-swift || failed=1 exit $failed ;; @@ -902,10 +892,8 @@ case "$COMMAND" in sh build.sh verify-swiftlint sh build.sh verify-swiftpm sh build.sh verify-osx-object-server - if (( $(xcode_version_major) >= 11 )); then - sh build.sh verify-catalyst - sh build.sh verify-catalyst-swift - fi + sh build.sh verify-catalyst + sh build.sh verify-catalyst-swift ;; "verify-cocoapods") @@ -1221,16 +1209,6 @@ case "$COMMAND" in # CocoaPods ###################################### "cocoapods-setup") - if [ ! -d core ]; then - sh build.sh download-sync - rm core - mv sync-* core - 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 - fi - if [[ "$2" != "swift" ]]; then if [ ! -d Realm/ObjectStore/src ]; then cat >&2 <<EOM @@ -1246,6 +1224,16 @@ EOM exit 1 fi + if [ ! -d core ]; then + sh build.sh download-sync + rm core + mv sync-* core + 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 + fi + rm -rf include mkdir -p include mv core/include include/core @@ -1407,11 +1395,7 @@ EOM set_xcode_and_swift_versions - if [[ "$PLATFORM" = "catalyst" ]] && (( $(xcode_version_major) < 11 )); then - mkdir -p build/catalyst/swift-$REALM_XCODE_VERSION - else - sh build.sh $PLATFORM-swift - fi + sh build.sh $PLATFORM-swift cd build/$PLATFORM zip --symlinks -r realm-framework-$PLATFORM-$REALM_XCODE_VERSION.zip swift-$REALM_XCODE_VERSION diff --git a/Carthage/Checkouts/realm-cocoa/dependencies.list b/Carthage/Checkouts/realm-cocoa/dependencies.list index 7b304d2ab..876eb6eb8 100644 --- a/Carthage/Checkouts/realm-cocoa/dependencies.list +++ b/Carthage/Checkouts/realm-cocoa/dependencies.list @@ -1,4 +1,4 @@ -VERSION=5.1.0 -REALM_CORE_VERSION=6.0.6 -REALM_SYNC_VERSION=5.0.5 +VERSION=5.2.0 +REALM_CORE_VERSION=6.0.8 +REALM_SYNC_VERSION=5.0.7 REALM_OBJECT_SERVER_VERSION=3.28.5 diff --git a/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsDynamicExample/Podfile b/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsDynamicExample/Podfile index abf7004d6..1aa26a234 100644 --- a/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsDynamicExample/Podfile +++ b/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsDynamicExample/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '6.0' +platform :ios, '9.0' use_frameworks! branch = ENV['sha'] diff --git a/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsExample/Podfile b/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsExample/Podfile index f926386c5..1ddbc34b7 100644 --- a/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsExample/Podfile +++ b/Carthage/Checkouts/realm-cocoa/examples/installation/ios/objc/CocoaPodsExample/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '6.0' +platform :ios, '9.0' branch = ENV['sha'] diff --git a/Carthage/Checkouts/realm-cocoa/examples/installation/ios/swift/CocoaPodsExample/Podfile b/Carthage/Checkouts/realm-cocoa/examples/installation/ios/swift/CocoaPodsExample/Podfile index 12754e16f..dd6ebed8e 100644 --- a/Carthage/Checkouts/realm-cocoa/examples/installation/ios/swift/CocoaPodsExample/Podfile +++ b/Carthage/Checkouts/realm-cocoa/examples/installation/ios/swift/CocoaPodsExample/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '6.0' +platform :ios, '9.0' branch = ENV['sha'] diff --git a/Carthage/Checkouts/realm-cocoa/examples/ios/objc/Podfile b/Carthage/Checkouts/realm-cocoa/examples/ios/objc/Podfile index ccccb1779..27c48fbfb 100644 --- a/Carthage/Checkouts/realm-cocoa/examples/ios/objc/Podfile +++ b/Carthage/Checkouts/realm-cocoa/examples/ios/objc/Podfile @@ -1,4 +1,4 @@ -platform :ios, '7.0' +platform :ios, '9.0' target 'RACTableView' do pod 'ReactiveCocoa', :inhibit_warnings => true diff --git a/Carthage/Checkouts/realm-cocoa/scripts/package_examples.rb b/Carthage/Checkouts/realm-cocoa/scripts/package_examples.rb index 09a87d08b..986ce90c8 100755 --- a/Carthage/Checkouts/realm-cocoa/scripts/package_examples.rb +++ b/Carthage/Checkouts/realm-cocoa/scripts/package_examples.rb @@ -41,7 +41,7 @@ base_examples = [ "examples/tvos/swift", ] -xcode_versions = %w(10.3 11.1 11.2.1 11.3 11.4.1 11.5) +xcode_versions = %w(11.3 11.4.1 11.5) # Remove reference to Realm.xcodeproj from all example workspaces. base_examples.each do |example| diff --git a/Carthage/Checkouts/realm-cocoa/scripts/reset-simulators.rb b/Carthage/Checkouts/realm-cocoa/scripts/reset-simulators.rb index 542ded533..5641d9221 100755 --- a/Carthage/Checkouts/realm-cocoa/scripts/reset-simulators.rb +++ b/Carthage/Checkouts/realm-cocoa/scripts/reset-simulators.rb @@ -141,9 +141,11 @@ begin end end - # Error code 161-163 indicate that the given device is not supported by the runtime, such as the iPad 2 and - # iPhone 4s not being supported by the iOS 10 simulator runtime. - next if output =~ /(domain=com.apple.CoreSimulator.SimError, code=16[123])/ + # Not all runtime and device pairs are valid as newer simulator runtimes + # don't support older devices. The exact error code for this changes + # every few versions of Xcode, so this just lists all the ones we've + # seen. + next if /domain=com.apple.CoreSimulator.SimError, code=(?<code>\d+)/ =~ output and [161, 162, 163, 403].include? code.to_i puts "Failed to create device of type #{device_type['identifier']} with runtime #{runtime['identifier']}:" output.each_line do |line| |