Skip to content

Commit 7404c7a

Browse files
authored
Merge pull request #1 from RxSwiftCommunity/main
2 parents e03e3ce + 117bf24 commit 7404c7a

File tree

9 files changed

+86
-69
lines changed

9 files changed

+86
-69
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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.6](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.6%0Dv5.0.5) (2023-10-28)
6+
7+
8+
### Bug Fixes
9+
10+
* ci ([66e43ab](https://github.com/RxSwiftCommunity/RxRealm/commits/66e43ab63448892cbef60d11468614795582a3e2))
11+
512
### [5.0.5](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.5%0Dv5.0.4) (2022-03-09)
613

714
### [5.0.4](https://github.com/RxSwiftCommunity/RxRealm/branches/compare/v5.0.4%0Dv5.0.3) (2022-01-19)

Examples/Podfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def common_tests
1111
end
1212

1313
target "RxRealmDemo-iOS" do
14-
platform :ios, "11.0"
14+
platform :ios, "12.0"
1515
common
1616
end
1717

@@ -24,3 +24,13 @@ end
2424
# platform :tvos, "9.0"
2525
# common
2626
# end
27+
28+
post_install do |installer|
29+
installer.pods_project.targets.each do |target|
30+
target.build_configurations.each do |config|
31+
if Gem::Version.new('12.0') > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
32+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
33+
end
34+
end
35+
end
36+
end

Examples/Podfile.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
PODS:
2-
- Realm (10.21.1):
3-
- Realm/Headers (= 10.21.1)
4-
- Realm/Headers (10.21.1)
5-
- RealmSwift (10.21.1):
6-
- Realm (= 10.21.1)
7-
- RxCocoa (6.5.0):
8-
- RxRelay (= 6.5.0)
9-
- RxSwift (= 6.5.0)
10-
- RxRealm (5.0.4):
11-
- Realm (~> 10.21)
12-
- RealmSwift (~> 10.21)
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)
1313
- RxCocoa (~> 6.1)
1414
- RxSwift (~> 6.1)
15-
- RxRelay (6.5.0):
16-
- RxSwift (= 6.5.0)
17-
- RxSwift (6.5.0)
15+
- RxRelay (6.6.0):
16+
- RxSwift (= 6.6.0)
17+
- RxSwift (6.6.0)
1818

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

3434
SPEC CHECKSUMS:
35-
Realm: 44b41c3ae39e3ecfded71a04434bfde066c7b317
36-
RealmSwift: dbf9a4eb06e0c929d51c4ef2e8f951bca541feab
37-
RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b
38-
RxRealm: 666c8785327fe2fff972a3093b35dc7055c1ca38
39-
RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
40-
RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
35+
Realm: 731e86d9388287b18e36b0beb2493fc4845ce8a2
36+
RealmSwift: c2a1059ba52e1e08467b1253b1d4ab354ef3177b
37+
RxCocoa: 44a80de90e25b739b5aeaae3c8c371a32e3343cc
38+
RxRealm: 70ddbd78ac8f3d94998dadf380a4c0f83aaf259c
39+
RxRelay: 45eaa5db8ee4fb50e5ebd57deec0159e97fa51e6
40+
RxSwift: a4b44f7d24599f674deebd1818eab82e58410632
4141

42-
PODFILE CHECKSUM: c18aa0767a67d16eff537312e81255933c8a0f4e
42+
PODFILE CHECKSUM: df29b255dac1d305deddb3b085a7407b288544fc
4343

44-
COCOAPODS: 1.11.2
44+
COCOAPODS: 1.14.2

Examples/RxRealmDemo.xcodeproj/project.pbxproj

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
025AFE3743CE73F806425BAF /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 26DE8661C8721C6102A4F087 /* LaunchScreen.xib */; };
11+
13BD54D2BB0EBD66F4F2DADC /* Pods_RxRealmDemo_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 562FE4AD26713C0C4DEF9226 /* Pods_RxRealmDemo_iOS.framework */; };
1112
3BB28BD3D65B1369D1A64960 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54597D6B66FBF23FCBF1A7DB /* Images.xcassets */; };
1213
84E694181E51B3B4646D1225 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 49505648CF8974BEF397F106 /* Main.storyboard */; };
1314
8E1DB46DA84AA944224297EC /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18CF27BE5242F49EDEA89577 /* ViewController.swift */; };
14-
D4892574CEB9161639C20869 /* Pods_RxRealmDemo_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 10CA015110DF798304ED7543 /* Pods_RxRealmDemo_iOS.framework */; };
1515
DAEB28CFA861A50143F84323 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6298C0EF6C7C86E33743B8B5 /* AppDelegate.swift */; };
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXFileReference section */
19-
10CA015110DF798304ED7543 /* Pods_RxRealmDemo_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxRealmDemo_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
20-
134BEAE91A12B5CD042607E6 /* Pods-RxRealmDemo-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealmDemo-iOS.release.xcconfig"; path = "Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS.release.xcconfig"; sourceTree = "<group>"; };
2119
18CF27BE5242F49EDEA89577 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
22-
4F952C34DD4B82E9E012B678 /* Pods-RxRealmDemo-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealmDemo-iOS.debug.xcconfig"; path = "Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS.debug.xcconfig"; sourceTree = "<group>"; };
2320
5050BD06022D9BA067993ACD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
2421
54597D6B66FBF23FCBF1A7DB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
22+
562FE4AD26713C0C4DEF9226 /* Pods_RxRealmDemo_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxRealmDemo_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2523
6298C0EF6C7C86E33743B8B5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
26-
645D257F7774284AE08348E5 /* RxRealmDemo-iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "RxRealmDemo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
24+
645D257F7774284AE08348E5 /* RxRealmDemo-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RxRealmDemo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2725
82BCDF2341D78059DF2C89F2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
2826
C430B976866CC45900487D76 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
27+
C5A5D55D5CC50F77DE071B83 /* Pods-RxRealmDemo-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealmDemo-iOS.debug.xcconfig"; path = "Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS.debug.xcconfig"; sourceTree = "<group>"; };
28+
E7759D109C2ABA35C4C5A7ED /* Pods-RxRealmDemo-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxRealmDemo-iOS.release.xcconfig"; path = "Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS.release.xcconfig"; sourceTree = "<group>"; };
2929
/* End PBXFileReference section */
3030

3131
/* Begin PBXFrameworksBuildPhase section */
32-
E04013C2F780BB33A90A86BA /* Frameworks */ = {
32+
0452B0E845B69604F8EFBE7C /* Frameworks */ = {
3333
isa = PBXFrameworksBuildPhase;
3434
buildActionMask = 2147483647;
3535
files = (
36-
D4892574CEB9161639C20869 /* Pods_RxRealmDemo_iOS.framework in Frameworks */,
36+
13BD54D2BB0EBD66F4F2DADC /* Pods_RxRealmDemo_iOS.framework in Frameworks */,
3737
);
3838
runOnlyForDeploymentPostprocessing = 0;
3939
};
@@ -61,36 +61,35 @@
6161
name = Products;
6262
sourceTree = "<group>";
6363
};
64-
88600FDA4DAB72A51A9EACBF /* Frameworks */ = {
64+
A6E8CE38563E4EA24A16F2CD = {
6565
isa = PBXGroup;
6666
children = (
67-
10CA015110DF798304ED7543 /* Pods_RxRealmDemo_iOS.framework */,
67+
4A214DAA98C5247C1C84689A /* RxRealmDemo-iOS */,
68+
6531959FA0DFC568430ACAAB /* Products */,
69+
C0D0418E03D8CC5CCBCA74A2 /* Pods */,
70+
CFCCE2C0EDE6F7ECC0D0B468 /* Frameworks */,
6871
);
69-
name = Frameworks;
72+
indentWidth = 2;
7073
sourceTree = "<group>";
74+
tabWidth = 2;
75+
usesTabs = 0;
7176
};
72-
8DBD6278D187BEFFF563E53D /* Pods */ = {
77+
C0D0418E03D8CC5CCBCA74A2 /* Pods */ = {
7378
isa = PBXGroup;
7479
children = (
75-
4F952C34DD4B82E9E012B678 /* Pods-RxRealmDemo-iOS.debug.xcconfig */,
76-
134BEAE91A12B5CD042607E6 /* Pods-RxRealmDemo-iOS.release.xcconfig */,
80+
C5A5D55D5CC50F77DE071B83 /* Pods-RxRealmDemo-iOS.debug.xcconfig */,
81+
E7759D109C2ABA35C4C5A7ED /* Pods-RxRealmDemo-iOS.release.xcconfig */,
7782
);
78-
name = Pods;
7983
path = Pods;
8084
sourceTree = "<group>";
8185
};
82-
A6E8CE38563E4EA24A16F2CD = {
86+
CFCCE2C0EDE6F7ECC0D0B468 /* Frameworks */ = {
8387
isa = PBXGroup;
8488
children = (
85-
4A214DAA98C5247C1C84689A /* RxRealmDemo-iOS */,
86-
6531959FA0DFC568430ACAAB /* Products */,
87-
8DBD6278D187BEFFF563E53D /* Pods */,
88-
88600FDA4DAB72A51A9EACBF /* Frameworks */,
89+
562FE4AD26713C0C4DEF9226 /* Pods_RxRealmDemo_iOS.framework */,
8990
);
90-
indentWidth = 2;
91+
name = Frameworks;
9192
sourceTree = "<group>";
92-
tabWidth = 2;
93-
usesTabs = 0;
9493
};
9594
/* End PBXGroup section */
9695

@@ -99,11 +98,11 @@
9998
isa = PBXNativeTarget;
10099
buildConfigurationList = 960759C5E7AEB6ABF2CBF1A5 /* Build configuration list for PBXNativeTarget "RxRealmDemo-iOS" */;
101100
buildPhases = (
102-
F562FF3C332086030AC7078B /* [CP] Check Pods Manifest.lock */,
101+
9E09E32F7F593B502A0A9650 /* [CP] Check Pods Manifest.lock */,
103102
9F070CB36A79D85BB2876A0D /* Sources */,
104103
5C6A37C6E8CA2E27A0ECA6AA /* Resources */,
105-
E04013C2F780BB33A90A86BA /* Frameworks */,
106-
6371E92950D311C142D4BE5E /* [CP] Embed Pods Frameworks */,
104+
0452B0E845B69604F8EFBE7C /* Frameworks */,
105+
21A0E7521E409A56D88F9065 /* [CP] Embed Pods Frameworks */,
107106
);
108107
buildRules = (
109108
);
@@ -122,11 +121,9 @@
122121
attributes = {
123122
LastUpgradeCheck = 1220;
124123
ORGANIZATIONNAME = RxSwiftCommunity;
125-
TargetAttributes = {
126-
};
127124
};
128125
buildConfigurationList = 94914E22EBC7A74B395EF186 /* Build configuration list for PBXProject "RxRealmDemo" */;
129-
compatibilityVersion = "Xcode 10.0";
126+
compatibilityVersion = "Xcode 11.0";
130127
developmentRegion = en;
131128
hasScannedForEncodings = 0;
132129
knownRegions = (
@@ -157,7 +154,7 @@
157154
/* End PBXResourcesBuildPhase section */
158155

159156
/* Begin PBXShellScriptBuildPhase section */
160-
6371E92950D311C142D4BE5E /* [CP] Embed Pods Frameworks */ = {
157+
21A0E7521E409A56D88F9065 /* [CP] Embed Pods Frameworks */ = {
161158
isa = PBXShellScriptBuildPhase;
162159
buildActionMask = 2147483647;
163160
files = (
@@ -174,7 +171,7 @@
174171
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxRealmDemo-iOS/Pods-RxRealmDemo-iOS-frameworks.sh\"\n";
175172
showEnvVarsInLog = 0;
176173
};
177-
F562FF3C332086030AC7078B /* [CP] Check Pods Manifest.lock */ = {
174+
9E09E32F7F593B502A0A9650 /* [CP] Check Pods Manifest.lock */ = {
178175
isa = PBXShellScriptBuildPhase;
179176
buildActionMask = 2147483647;
180177
files = (
@@ -232,12 +229,13 @@
232229
/* Begin XCBuildConfiguration section */
233230
0FCE882B186F10CBD63A5EF1 /* Debug */ = {
234231
isa = XCBuildConfiguration;
235-
baseConfigurationReference = 4F952C34DD4B82E9E012B678 /* Pods-RxRealmDemo-iOS.debug.xcconfig */;
232+
baseConfigurationReference = C5A5D55D5CC50F77DE071B83 /* Pods-RxRealmDemo-iOS.debug.xcconfig */;
236233
buildSettings = {
237234
ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON_NAME)";
238235
CODE_SIGN_IDENTITY = "iPhone Developer";
239236
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
240237
INFOPLIST_FILE = "RxRealmDemo-iOS/Info.plist";
238+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
241239
LD_RUNPATH_SEARCH_PATHS = (
242240
"$(inherited)",
243241
"@executable_path/Frameworks",
@@ -315,12 +313,13 @@
315313
};
316314
84000E9CA8521983711240B4 /* Release */ = {
317315
isa = XCBuildConfiguration;
318-
baseConfigurationReference = 134BEAE91A12B5CD042607E6 /* Pods-RxRealmDemo-iOS.release.xcconfig */;
316+
baseConfigurationReference = E7759D109C2ABA35C4C5A7ED /* Pods-RxRealmDemo-iOS.release.xcconfig */;
319317
buildSettings = {
320318
ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON_NAME)";
321319
CODE_SIGN_IDENTITY = "iPhone Developer";
322320
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
323321
INFOPLIST_FILE = "RxRealmDemo-iOS/Info.plist";
322+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
324323
LD_RUNPATH_SEARCH_PATHS = (
325324
"$(inherited)",
326325
"@executable_path/Frameworks",

Examples/RxRealmDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/RxRealmDemo.xcodeproj/xcshareddata/xcschemes/RxRealmDemo-iOS.xcscheme

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "1220"
4-
version = "1.3">
4+
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "YES"
8+
runPostActionsOnFailure = "NO">
89
<BuildActionEntries>
910
<BuildActionEntry
1011
buildForTesting = "YES"
@@ -26,10 +27,8 @@
2627
buildConfiguration = "Debug"
2728
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2829
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
onlyGenerateCoverageForSpecifiedTargets = "NO"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
31-
<Testables>
32-
</Testables>
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "NO">
3332
<MacroExpansion>
3433
<BuildableReference
3534
BuildableIdentifier = "primary"
@@ -39,6 +38,8 @@
3938
ReferencedContainer = "container:RxRealmDemo.xcodeproj">
4039
</BuildableReference>
4140
</MacroExpansion>
41+
<Testables>
42+
</Testables>
4243
</TestAction>
4344
<LaunchAction
4445
buildConfiguration = "Debug"

Examples/project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ options:
77
tabWidth: 2
88
xcodeVersion: "1220"
99
deploymentTarget:
10-
iOS: "11.0"
10+
iOS: "12.0"
1111
defaultConfig: "Release"
1212
configs:
1313
Debug: debug

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,4 +367,4 @@ DEPENDENCIES
367367
xcov (~> 1.7.3)
368368

369369
BUNDLED WITH
370-
2.1.4
370+
2.1.4

RxRealm.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "RxRealm"
33
# Version to always follow latest tag, with fallback to major
4-
s.version = "5.0.5"
4+
s.version = "5.0.6"
55
s.license = "MIT"
66
s.description = <<-DESC
77
This is an Rx extension that provides an easy and straight-forward way
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
1414
s.source = { :git => "https://github.com/RxSwiftCommunity/RxRealm.git", :tag => "v" + s.version.to_s }
1515
s.swift_version = "5.1"
1616

17-
s.ios.deployment_target = "11.0"
17+
s.ios.deployment_target = "12.0"
1818
s.osx.deployment_target = "10.10"
1919
s.tvos.deployment_target = "9.0"
2020
s.watchos.deployment_target = "3.0"
@@ -24,8 +24,8 @@ Pod::Spec.new do |s|
2424
s.source_files = "Sources/RxRealm/*.swift"
2525

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

0 commit comments

Comments
 (0)