Skip to content

Commit

Permalink
0.2.1 compatibility with RxRealm 0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
icanzilb committed Jan 23, 2017
1 parent ebaa20f commit f0b13e3
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use_frameworks!

abstract_target 'Demo' do
pod 'RealmSwift'
pod 'RxSwift'
pod 'RxCocoa'
pod 'RxRealm'
pod 'RealmSwift', '~> 2.1'
pod 'RxSwift', '~> 3.1'
pod 'RxCocoa', '~> 3.1'
pod 'RxRealm', '~> 0.5'
pod 'RxRealmDataSources', :path => '../'

target 'RxRealmDataSources_Example' do
Expand Down
13 changes: 10 additions & 3 deletions Example/RxRealmDataSources.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = CocoaPods;
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
Expand All @@ -402,6 +402,7 @@
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = 9MF8G8D9Y5;
LastSwiftMigration = 0810;
TestTargetID = 607FACCF1AFB9204008FA782;
};
Expand Down Expand Up @@ -768,7 +769,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 433CFEEAC500E1915E943474 /* Pods-Demo-RxRealmDataSources_Example.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 9MF8G8D9Y5;
INFOPLIST_FILE = RxRealmDataSources/Info.plist;
Expand All @@ -784,7 +785,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E709FF280BD1C0E98E09724E /* Pods-Demo-RxRealmDataSources_Example.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 9MF8G8D9Y5;
INFOPLIST_FILE = RxRealmDataSources/Info.plist;
Expand All @@ -800,6 +801,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 99BB71D2BBF16D9A1E926201 /* Pods-Demo-RxRealmDataSources_Tests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = 9MF8G8D9Y5;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -820,6 +823,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DFC39AF64C9AE4D3B6F7655F /* Pods-Demo-RxRealmDataSources_Tests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = 9MF8G8D9Y5;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -836,6 +841,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 608B2F81EBE23EAF84A87062 /* Pods-Demo-RxRealmDataSources_MacExample.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
Expand All @@ -859,6 +865,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EBE80B271B15C2CEC56038E /* Pods-Demo-RxRealmDataSources_MacExample.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Example/RxRealmDataSources/CollectionViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CollectionViewController: UIViewController {

// RxRealm to get Observable<Results>
let realm = try! Realm(configuration: data.config)
let laps = Observable.changesetFrom(realm.objects(Timer.self).first!.laps)
let laps = Observable.changeset(from: realm.objects(Timer.self).first!.laps)
.share()

// bind to collection view
Expand Down
2 changes: 1 addition & 1 deletion Example/RxRealmDataSources/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ViewController: UIViewController {

// RxRealm to get Observable<Results>
let realm = try! Realm(configuration: data.config)
let laps = Observable.changesetFrom(realm.objects(Timer.self).first!.laps)
let laps = Observable.changeset(from: realm.objects(Timer.self).first!.laps)
.share()

// bind to table view
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let dataSource = RxTableViewRealmDataSource<Lap>(cellIdentifier: "Cell", cellTyp

// RxRealm to get Observable<Results>
let realm = try! Realm(configuration: DataRandomizer.realmConfig)
let laps = Observable.changesetFrom(realm.objects(Timer.self).first!.laps)
let laps = Observable.changeset(from: realm.objects(Timer.self).first!.laps)
.share()

// bind to table view
Expand All @@ -47,7 +47,7 @@ let dataSource = RxCollectionViewRealmDataSource<Lap>(cellIdentifier: "Cell", ce

// RxRealm to get Observable<Results>
let realm = try! Realm(configuration: DataRandomizer.realmConfig)
let laps = Observable.changesetFrom(realm.objects(Timer.self).first!.laps)
let laps = Observable.changeset(from: realm.objects(Timer.self).first!.laps)
.share()

// bind to collection view
Expand Down
4 changes: 2 additions & 2 deletions RxRealmDataSources.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = 'RxRealmDataSources'
s.version = '0.2.0'
s.version = '0.2.1'
s.summary = 'Rx data sources for RxRealm`s observable types'

s.description = <<-DESC
Expand All @@ -26,5 +26,5 @@ Pod::Spec.new do |s|
s.dependency 'RealmSwift', '~> 2.1'
s.dependency 'RxSwift', '~> 3.1'
s.dependency 'RxCocoa', '~> 3.1'
s.dependency 'RxRealm', '~> 0.4.1'
s.dependency 'RxRealm', '~> 0.5'
end

0 comments on commit f0b13e3

Please sign in to comment.