Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI, CocoaPods and SwiftPM #216

Merged
merged 6 commits into from
May 7, 2024
Merged

Fix CI, CocoaPods and SwiftPM #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c2ac58
XCode Package.resolved updated
JoeMatt May 7, 2024
2f34f84
CHANGELOG.md fix formatting and dupes
JoeMatt May 7, 2024
6cd25a3
Fix tests with RxSwift.Observable
JoeMatt May 7, 2024
b725283
pods.sh chmod +x
JoeMatt May 7, 2024
611d19f
RxRealm.podspec match Realm pod versions and mins
JoeMatt May 7, 2024
825b1b1
Examples pod update
JoeMatt May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 14 additions & 47 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
=========
Expand Down
42 changes: 21 additions & 21 deletions Examples/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 `../`)
Expand All @@ -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
20 changes: 10 additions & 10 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
"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"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
"version": "6.5.0"
"revision": "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
"version": "6.7.1"
}
}
]
Expand Down
10 changes: 5 additions & 5 deletions RxRealm.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions Tests/RxRealmTests/RxRealmRealmTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import RealmSwift
import RxRealm
import RxSwift


class RxRealmRealmTests: XCTestCase {
let allTests = [
"testRealmDidChangeNotifications": testRealmDidChangeNotifications,
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
Empty file modified pods.sh
100644 → 100755
View file
Open in desktop
Empty file.
Loading