From 9c2ac5862b4ee5a2341b1b74cf836f78d04edd16 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 May 2024 18:45:21 -0400 Subject: [PATCH 1/6] XCode Package.resolved updated Signed-off-by: Joseph Mattello --- Package.resolved | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Package.resolved b/Package.resolved index 8fb9fbc..ff7cb3c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -2,21 +2,21 @@ "object": { "pins": [ { - "package": "Realm", - "repositoryURL": "https://github.com/realm/realm-cocoa.git", + "package": "RealmDatabase", + "repositoryURL": "https://github.com/realm/realm-core.git", "state": { "branch": null, - "revision": "39177714b95bb5b1b29fffe28f1c7da77eef8e8b", - "version": "10.21.1" + "revision": "9cf7ef4ad8e2f4c7a519c9a395ca3d253bb87aa8", + "version": "14.6.2" } }, { - "package": "RealmDatabase", - "repositoryURL": "https://github.com/realm/realm-core", + "package": "Realm", + "repositoryURL": "https://github.com/realm/realm-swift.git", "state": { "branch": null, - "revision": "f1976f0d96d9b06fbe0afbd60090b1c3966b1e23", - "version": "11.8.0" + "revision": "2000569f03948c281afc83c36c710ab15e5dd33c", + "version": "10.50.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8", - "version": "6.5.0" + "revision": "b06a8c8596e4c3e8e7788e08e720e3248563ce6a", + "version": "6.7.1" } } ] From 2f34f84a0316c0a7327c3386c33e19f9a172b2a1 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 May 2024 18:53:53 -0400 Subject: [PATCH 2/6] CHANGELOG.md fix formatting and dupes Signed-off-by: Joseph Mattello --- CHANGELOG.md | 61 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8da855f..d47b157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,87 +2,55 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### [5.0.8](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.8%0Dv5.0.7) (2024-05-07) +## [5.0.8](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.8%0Dv5.0.7) (2024-05-07) -### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29) +- Merge pull request #210 from trmquang93/main; override namespace Observable -### 5.0.5 (2022-03-09) +## [5.0.7](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.7%0Dv5.0.6) (2024-03-08) -### [5.0.8](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.8%0Dv5.0.7) (2024-05-07) - -### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29) - -### 5.0.5 (2022-03-09) - -### [5.0.7](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.7%0Dv5.0.6) (2024-03-08) - -### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29) - - -### Bug Fixes - -* ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2)) - -### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29) - - -### Bug Fixes - -* ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2)) - -### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-28) +### Updates +- Merge pull request #209 from markusfi/main; update RxRealm.podspec: Realm dependency updated to 10.44 +## [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29) ### Bug Fixes * ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2)) -### [5.0.5](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.5%0Dv5.0.4) (2022-03-09) - -### [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-19) - +## [5.0.5](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.5%0Dv5.0.4) (2022-03-09) ### Bug Fixes * replacing rx attribute of Realm type by standard Reactive extension. ([dabb105](https://github.com/RxSwiftCommunity/RxRealm/commits/dabb105c94a6c0fdccbf99bb618b618be3f0d5c0)) * update Realm and RxSwift to latest version ([#178](https://github.com/RxSwiftCommunity/RxRealm/issues/178)) ([63d00c6](https://github.com/RxSwiftCommunity/RxRealm/commits/63d00c6349b31d4e26fd5b5a5e428400b6b91356)) -### [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-16) - +## [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-16) ### Bug Fixes * replacing rx attribute of Realm type by standard Reactive extension. ([dabb105](https://github.com/RxSwiftCommunity/RxRealm/commits/dabb105c94a6c0fdccbf99bb618b618be3f0d5c0)) -### [5.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.3%0Dv5.0.2) (2021-09-05) - -### [5.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.2%0Dv5.0.1) (2021-05-10) - -### [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-05) +## [5.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.3%0Dv5.0.2) (2021-09-05) +## [5.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.2%0Dv5.0.1) (2021-05-10) ### Bug Fixes * Brew before generate project ([7eef1d1](https://github.com/RxSwiftCommunity/RxRealm/commits/7eef1d1ba130627af7d140682f912c89830cf1eb)) * Bump version script fix ([8f9f99f](https://github.com/RxSwiftCommunity/RxRealm/commits/8f9f99f4680a07cbeedd63cfb7a26e269b907bf9)) -### [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-05) - +## [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-04) ### Bug Fixes * Bump version script fix ([8f9f99f](https://github.com/RxSwiftCommunity/RxRealm/commits/8f9f99f4680a07cbeedd63cfb7a26e269b907bf9)) -### [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-04) - - ### Bug Fixes * Bump version script fix ([8f9f99f](https://github.com/RxSwiftCommunity/RxRealm/commits/8f9f99f4680a07cbeedd63cfb7a26e269b907bf9)) ## [5.0.0](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.0%0Dv4.0.3) (2021-01-03) - ### ⚠ BREAKING CHANGES * RxSwift 6.0.0 support @@ -91,16 +59,15 @@ All notable changes to this project will be documented in this file. See [standa * Supports xcframework as per release ([09c2a93](https://github.com/RxSwiftCommunity/RxRealm/commits/09c2a93da5e0ca43fa323e2c76f356d07320069d)) - ### Bug Fixes * Podspec version ([5c750e7](https://github.com/RxSwiftCommunity/RxRealm/commits/5c750e788284f54b981eaf2d7af5c3f1d61600a8)) -### [4.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.3%0Dv4.0.2) (2020-12-20) +## [4.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.3%0Dv4.0.2) (2020-12-20) -### [4.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.2%0Dv4.0.1) (2020-12-05) +## [4.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.2%0Dv4.0.1) (2020-12-05) -### 4.0.1 (2020-12-05) +## 4.0.1 (2020-12-05) Changelog ========= From 6cd25a38dc1c6826710f158281372fe35eae975c Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 May 2024 19:04:36 -0400 Subject: [PATCH 3/6] Fix tests with RxSwift.Observable Signed-off-by: Joseph Mattello --- Tests/RxRealmTests/RxRealmRealmTests.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/RxRealmTests/RxRealmRealmTests.swift b/Tests/RxRealmTests/RxRealmRealmTests.swift index 66fe631..0b6e719 100644 --- a/Tests/RxRealmTests/RxRealmRealmTests.swift +++ b/Tests/RxRealmTests/RxRealmRealmTests.swift @@ -12,6 +12,7 @@ import RealmSwift import RxRealm import RxSwift + class RxRealmRealmTests: XCTestCase { let allTests = [ "testRealmDidChangeNotifications": testRealmDidChangeNotifications, @@ -20,7 +21,7 @@ class RxRealmRealmTests: XCTestCase { func testRealmDidChangeNotifications() { let realm = realmInMemory(#function) - let realmNotifications = Observable<(Realm, Realm.Notification)>.from(realm: realm) + let realmNotifications = RxSwift.Observable<(Realm, Realm.Notification)>.from(realm: realm) DispatchQueue.main.async { try! realm.write { @@ -44,7 +45,7 @@ class RxRealmRealmTests: XCTestCase { let realm = realmInMemory(#function) realm.autorefresh = false - let realmNotifications = Observable<(Realm, Realm.Notification)>.from(realm: realm) + let realmNotifications = RxSwift.Observable<(Realm, Realm.Notification)>.from(realm: realm) DispatchQueue.main.async { try! realm.write { From b7252836de5197a81b9cb9e9a13b9e65763356c7 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 May 2024 19:16:47 -0400 Subject: [PATCH 4/6] pods.sh chmod +x Signed-off-by: Joseph Mattello --- pods.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pods.sh diff --git a/pods.sh b/pods.sh old mode 100644 new mode 100755 From 611d19fc14be7a5ba3373bc79178e8007313586d Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 May 2024 19:17:32 -0400 Subject: [PATCH 5/6] RxRealm.podspec match Realm pod versions and mins updated min tvos, watchos, macos versions to match realm swift min versions Signed-off-by: Joseph Mattello --- RxRealm.podspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RxRealm.podspec b/RxRealm.podspec index 2c8341a..f60701d 100644 --- a/RxRealm.podspec +++ b/RxRealm.podspec @@ -15,17 +15,17 @@ Pod::Spec.new do |s| s.swift_version = "5.1" s.ios.deployment_target = "12.0" - s.osx.deployment_target = "10.10" - s.tvos.deployment_target = "9.0" - s.watchos.deployment_target = "3.0" + s.osx.deployment_target = "10.13" + s.tvos.deployment_target = "12.0" + s.watchos.deployment_target = "4.0" s.requires_arc = true s.source_files = "Sources/RxRealm/*.swift" s.frameworks = "Foundation" - s.dependency "Realm", "~> 10.44" - s.dependency "RealmSwift", "~> 10.44" + s.dependency "Realm", "~> 10.50" + s.dependency "RealmSwift", "~> 10.50" s.dependency "RxSwift", "~> 6.1" s.dependency "RxCocoa", "~> 6.1" end From 825b1b1018d7c3bf290c940ca6c840162a12369e Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 May 2024 19:26:35 -0400 Subject: [PATCH 6/6] Examples pod update Signed-off-by: Joseph Mattello --- Examples/Podfile.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock index 15196a0..eda0946 100644 --- a/Examples/Podfile.lock +++ b/Examples/Podfile.lock @@ -1,20 +1,20 @@ PODS: - - Realm (10.40.2): - - Realm/Headers (= 10.40.2) - - Realm/Headers (10.40.2) - - RealmSwift (10.40.2): - - Realm (= 10.40.2) - - RxCocoa (6.6.0): - - RxRelay (= 6.6.0) - - RxSwift (= 6.6.0) - - RxRealm (5.0.5): - - Realm (~> 10.40.1) - - RealmSwift (~> 10.40.1) + - Realm (10.50.0): + - Realm/Headers (= 10.50.0) + - Realm/Headers (10.50.0) + - RealmSwift (10.50.0): + - Realm (= 10.50.0) + - RxCocoa (6.7.1): + - RxRelay (= 6.7.1) + - RxSwift (= 6.7.1) + - RxRealm (5.0.8): + - Realm (~> 10.50) + - RealmSwift (~> 10.50) - RxCocoa (~> 6.1) - RxSwift (~> 6.1) - - RxRelay (6.6.0): - - RxSwift (= 6.6.0) - - RxSwift (6.6.0) + - RxRelay (6.7.1): + - RxSwift (= 6.7.1) + - RxSwift (6.7.1) DEPENDENCIES: - RxRealm (from `../`) @@ -32,13 +32,13 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Realm: 731e86d9388287b18e36b0beb2493fc4845ce8a2 - RealmSwift: c2a1059ba52e1e08467b1253b1d4ab354ef3177b - RxCocoa: 44a80de90e25b739b5aeaae3c8c371a32e3343cc - RxRealm: 70ddbd78ac8f3d94998dadf380a4c0f83aaf259c - RxRelay: 45eaa5db8ee4fb50e5ebd57deec0159e97fa51e6 - RxSwift: a4b44f7d24599f674deebd1818eab82e58410632 + Realm: a0a6a99e3dfa8959358a95c3c05845b5e5d6af30 + RealmSwift: fa111fb98e092a4dff1d0785ad0c3483feda607a + RxCocoa: f5609cb4637587a7faa99c5d5787e3ad582b75a4 + RxRealm: 4858ba414f07514e38657d85807479bae6d0b9a9 + RxRelay: 4151ba01152436b08271e08410135e099880eae5 + RxSwift: b9a93a26031785159e11abd40d1a55bcb8057e52 PODFILE CHECKSUM: df29b255dac1d305deddb3b085a7407b288544fc -COCOAPODS: 1.14.2 +COCOAPODS: 1.14.0