Skip to content

Commit f7fad47

Browse files
JoeMattJoeMatt
authored
Merge pull request #216 from RxSwiftCommunity/feature/remove-realm-link
Fix CI, CocoaPods and SwiftPM
2 parents 6a8a449 + 825b1b1 commit f7fad47

File tree

6 files changed

+53
-85
lines changed

6 files changed

+53
-85
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,87 +2,55 @@
22

33
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.
44

5-
### [5.0.8](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.8%0Dv5.0.7) (2024-05-07)
5+
## [5.0.8](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.8%0Dv5.0.7) (2024-05-07)
66

7-
### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29)
7+
- Merge pull request #210 from trmquang93/main; override namespace Observable
88

9-
### 5.0.5 (2022-03-09)
9+
## [5.0.7](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.7%0Dv5.0.6) (2024-03-08)
1010

11-
### [5.0.8](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.8%0Dv5.0.7) (2024-05-07)
12-
13-
### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29)
14-
15-
### 5.0.5 (2022-03-09)
16-
17-
### [5.0.7](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.7%0Dv5.0.6) (2024-03-08)
18-
19-
### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29)
20-
21-
22-
### Bug Fixes
23-
24-
* ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2))
25-
26-
### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29)
27-
28-
29-
### Bug Fixes
30-
31-
* ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2))
32-
33-
### [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-28)
11+
### Updates
12+
- Merge pull request #209 from markusfi/main; update RxRealm.podspec: Realm dependency updated to 10.44
3413

14+
## [5.0.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-29)
3515

3616
### Bug Fixes
3717

3818
* ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2))
3919

40-
### [5.0.5](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.5%0Dv5.0.4) (2022-03-09)
41-
42-
### [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-19)
43-
20+
## [5.0.5](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.5%0Dv5.0.4) (2022-03-09)
4421

4522
### Bug Fixes
4623

4724
* replacing rx attribute of Realm type by standard Reactive extension. ([dabb105](https://github.com/RxSwiftCommunity/RxRealm/commits/dabb105c94a6c0fdccbf99bb618b618be3f0d5c0))
4825
* update Realm and RxSwift to latest version ([#178](https://github.com/RxSwiftCommunity/RxRealm/issues/178)) ([63d00c6](https://github.com/RxSwiftCommunity/RxRealm/commits/63d00c6349b31d4e26fd5b5a5e428400b6b91356))
4926

50-
### [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-16)
51-
27+
## [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-16)
5228

5329
### Bug Fixes
5430

5531
* replacing rx attribute of Realm type by standard Reactive extension. ([dabb105](https://github.com/RxSwiftCommunity/RxRealm/commits/dabb105c94a6c0fdccbf99bb618b618be3f0d5c0))
5632

57-
### [5.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.3%0Dv5.0.2) (2021-09-05)
58-
59-
### [5.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.2%0Dv5.0.1) (2021-05-10)
60-
61-
### [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-05)
33+
## [5.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.3%0Dv5.0.2) (2021-09-05)
6234

35+
## [5.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.2%0Dv5.0.1) (2021-05-10)
6336

6437
### Bug Fixes
6538

6639
* Brew before generate project ([7eef1d1](https://github.com/RxSwiftCommunity/RxRealm/commits/7eef1d1ba130627af7d140682f912c89830cf1eb))
6740
* Bump version script fix ([8f9f99f](https://github.com/RxSwiftCommunity/RxRealm/commits/8f9f99f4680a07cbeedd63cfb7a26e269b907bf9))
6841

69-
### [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-05)
70-
42+
## [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-04)
7143

7244
### Bug Fixes
7345

7446
* Bump version script fix ([8f9f99f](https://github.com/RxSwiftCommunity/RxRealm/commits/8f9f99f4680a07cbeedd63cfb7a26e269b907bf9))
7547

76-
### [5.0.1](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.1%0Dv5.0.0) (2021-01-04)
77-
78-
7948
### Bug Fixes
8049

8150
* Bump version script fix ([8f9f99f](https://github.com/RxSwiftCommunity/RxRealm/commits/8f9f99f4680a07cbeedd63cfb7a26e269b907bf9))
8251

8352
## [5.0.0](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.0%0Dv4.0.3) (2021-01-03)
8453

85-
8654
### ⚠ BREAKING CHANGES
8755

8856
* RxSwift 6.0.0 support
@@ -91,16 +59,15 @@ All notable changes to this project will be documented in this file. See [standa
9159

9260
* Supports xcframework as per release ([09c2a93](https://github.com/RxSwiftCommunity/RxRealm/commits/09c2a93da5e0ca43fa323e2c76f356d07320069d))
9361

94-
9562
### Bug Fixes
9663

9764
* Podspec version ([5c750e7](https://github.com/RxSwiftCommunity/RxRealm/commits/5c750e788284f54b981eaf2d7af5c3f1d61600a8))
9865

99-
### [4.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.3%0Dv4.0.2) (2020-12-20)
66+
## [4.0.3](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.3%0Dv4.0.2) (2020-12-20)
10067

101-
### [4.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.2%0Dv4.0.1) (2020-12-05)
68+
## [4.0.2](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v4.0.2%0Dv4.0.1) (2020-12-05)
10269

103-
### 4.0.1 (2020-12-05)
70+
## 4.0.1 (2020-12-05)
10471

10572
Changelog
10673
=========

‎Examples/Podfile.lock

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
PODS:
2-
- Realm (10.40.2):
3-
- Realm/Headers (= 10.40.2)
4-
- Realm/Headers (10.40.2)
5-
- RealmSwift (10.40.2):
6-
- Realm (= 10.40.2)
7-
- RxCocoa (6.6.0):
8-
- RxRelay (= 6.6.0)
9-
- RxSwift (= 6.6.0)
10-
- RxRealm (5.0.5):
11-
- Realm (~> 10.40.1)
12-
- RealmSwift (~> 10.40.1)
2+
- Realm (10.50.0):
3+
- Realm/Headers (= 10.50.0)
4+
- Realm/Headers (10.50.0)
5+
- RealmSwift (10.50.0):
6+
- Realm (= 10.50.0)
7+
- RxCocoa (6.7.1):
8+
- RxRelay (= 6.7.1)
9+
- RxSwift (= 6.7.1)
10+
- RxRealm (5.0.8):
11+
- Realm (~> 10.50)
12+
- RealmSwift (~> 10.50)
1313
- RxCocoa (~> 6.1)
1414
- RxSwift (~> 6.1)
15-
- RxRelay (6.6.0):
16-
- RxSwift (= 6.6.0)
17-
- RxSwift (6.6.0)
15+
- RxRelay (6.7.1):
16+
- RxSwift (= 6.7.1)
17+
- RxSwift (6.7.1)
1818

1919
DEPENDENCIES:
2020
- RxRealm (from `../`)
@@ -32,13 +32,13 @@ EXTERNAL SOURCES:
3232
:path: "../"
3333

3434
SPEC CHECKSUMS:
35-
Realm: 731e86d9388287b18e36b0beb2493fc4845ce8a2
36-
RealmSwift: c2a1059ba52e1e08467b1253b1d4ab354ef3177b
37-
RxCocoa: 44a80de90e25b739b5aeaae3c8c371a32e3343cc
38-
RxRealm: 70ddbd78ac8f3d94998dadf380a4c0f83aaf259c
39-
RxRelay: 45eaa5db8ee4fb50e5ebd57deec0159e97fa51e6
40-
RxSwift: a4b44f7d24599f674deebd1818eab82e58410632
35+
Realm: a0a6a99e3dfa8959358a95c3c05845b5e5d6af30
36+
RealmSwift: fa111fb98e092a4dff1d0785ad0c3483feda607a
37+
RxCocoa: f5609cb4637587a7faa99c5d5787e3ad582b75a4
38+
RxRealm: 4858ba414f07514e38657d85807479bae6d0b9a9
39+
RxRelay: 4151ba01152436b08271e08410135e099880eae5
40+
RxSwift: b9a93a26031785159e11abd40d1a55bcb8057e52
4141

4242
PODFILE CHECKSUM: df29b255dac1d305deddb3b085a7407b288544fc
4343

44-
COCOAPODS: 1.14.2
44+
COCOAPODS: 1.14.0

‎Package.resolved

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
"object": {
33
"pins": [
44
{
5-
"package": "Realm",
6-
"repositoryURL": "https://github.com/realm/realm-cocoa.git",
5+
"package": "RealmDatabase",
6+
"repositoryURL": "https://github.com/realm/realm-core.git",
77
"state": {
88
"branch": null,
9-
"revision": "39177714b95bb5b1b29fffe28f1c7da77eef8e8b",
10-
"version": "10.21.1"
9+
"revision": "9cf7ef4ad8e2f4c7a519c9a395ca3d253bb87aa8",
10+
"version": "14.6.2"
1111
}
1212
},
1313
{
14-
"package": "RealmDatabase",
15-
"repositoryURL": "https://github.com/realm/realm-core",
14+
"package": "Realm",
15+
"repositoryURL": "https://github.com/realm/realm-swift.git",
1616
"state": {
1717
"branch": null,
18-
"revision": "f1976f0d96d9b06fbe0afbd60090b1c3966b1e23",
19-
"version": "11.8.0"
18+
"revision": "2000569f03948c281afc83c36c710ab15e5dd33c",
19+
"version": "10.50.0"
2020
}
2121
},
2222
{
2323
"package": "RxSwift",
2424
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
2525
"state": {
2626
"branch": null,
27-
"revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
28-
"version": "6.5.0"
27+
"revision": "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
28+
"version": "6.7.1"
2929
}
3030
}
3131
]

‎RxRealm.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ Pod::Spec.new do |s|
1515
s.swift_version = "5.1"
1616

1717
s.ios.deployment_target = "12.0"
18-
s.osx.deployment_target = "10.10"
19-
s.tvos.deployment_target = "9.0"
20-
s.watchos.deployment_target = "3.0"
18+
s.osx.deployment_target = "10.13"
19+
s.tvos.deployment_target = "12.0"
20+
s.watchos.deployment_target = "4.0"
2121

2222
s.requires_arc = true
2323

2424
s.source_files = "Sources/RxRealm/*.swift"
2525

2626
s.frameworks = "Foundation"
27-
s.dependency "Realm", "~> 10.44"
28-
s.dependency "RealmSwift", "~> 10.44"
27+
s.dependency "Realm", "~> 10.50"
28+
s.dependency "RealmSwift", "~> 10.50"
2929
s.dependency "RxSwift", "~> 6.1"
3030
s.dependency "RxCocoa", "~> 6.1"
3131
end

‎Tests/RxRealmTests/RxRealmRealmTests.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import RealmSwift
1212
import RxRealm
1313
import RxSwift
1414

15+
1516
class RxRealmRealmTests: XCTestCase {
1617
let allTests = [
1718
"testRealmDidChangeNotifications": testRealmDidChangeNotifications,
@@ -20,7 +21,7 @@ class RxRealmRealmTests: XCTestCase {
2021
func testRealmDidChangeNotifications() {
2122
let realm = realmInMemory(#function)
2223

23-
let realmNotifications = Observable<(Realm, Realm.Notification)>.from(realm: realm)
24+
let realmNotifications = RxSwift.Observable<(Realm, Realm.Notification)>.from(realm: realm)
2425

2526
DispatchQueue.main.async {
2627
try! realm.write {
@@ -44,7 +45,7 @@ class RxRealmRealmTests: XCTestCase {
4445
let realm = realmInMemory(#function)
4546
realm.autorefresh = false
4647

47-
let realmNotifications = Observable<(Realm, Realm.Notification)>.from(realm: realm)
48+
let realmNotifications = RxSwift.Observable<(Realm, Realm.Notification)>.from(realm: realm)
4849

4950
DispatchQueue.main.async {
5051
try! realm.write {

‎pods.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)