Skip to content

Commit 19931fb

Browse files
author
Randy Webster
committed
Include required dependencies.
Update to RxJava2 RC4. Add getObservable method to Callbacks class. Change-Id: I4cb68413118a28e6f7103c4f7919c178ea80e676
1 parent 0f477d2 commit 19931fb

File tree

4 files changed

+36
-8
lines changed

4 files changed

+36
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#RxLoader
22
[![License](http://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square)](http://www.apache.org/licenses/LICENSE-2.0)
33
[![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat-square)](https://developer.android.com/about/versions/android-4.1.html)
4-
[![Download](https://img.shields.io/badge/JCenter-2.0.0--RC1-brightgreen.svg?style=flat-square)](https://bintray.com/l4digital/maven/RxLoader/_latestVersion)
4+
[![Download](https://img.shields.io/badge/JCenter-2.0.0--RC2-brightgreen.svg?style=flat-square)](https://bintray.com/l4digital/maven/RxLoader/_latestVersion)
55

66
An Android Loader that wraps an RxJava Observable.
77

@@ -14,7 +14,7 @@ RxLoader caches the data emitted by your Observable across orientation changes b
1414
####Gradle:
1515
~~~groovy
1616
dependencies {
17-
compile 'com.l4digital.rxloader:rxloader:2.0.0-RC1'
17+
compile 'com.l4digital.rxloader:rxloader:2.0.0-RC2'
1818
}
1919
~~~
2020

@@ -23,7 +23,7 @@ dependencies {
2323
<dependency>
2424
<groupId>com.l4digital.rxloader</groupId>
2525
<artifactId>rxloader</artifactId>
26-
<version>2.0.0-RC1</version>
26+
<version>2.0.0-RC2</version>
2727
</dependency>
2828
~~~
2929

rxloader/build.gradle

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'maven-publish'
2121
def libraryName = 'RxLoader'
2222
def libraryArtifact = 'rxloader'
2323
def libraryGroup = 'com.l4digital.rxloader'
24-
def libraryVersion = '2.0.0-RC1'
24+
def libraryVersion = '2.0.0-RC2'
2525

2626
android {
2727
compileSdkVersion 24
@@ -39,7 +39,7 @@ android {
3939
}
4040

4141
dependencies {
42-
compile 'io.reactivex.rxjava2:rxjava:2.0.0-RC3'
42+
compile 'io.reactivex.rxjava2:rxjava:2.0.0-RC4'
4343
compile 'io.reactivex.rxjava2:rxandroid:2.0.0-RC1'
4444
}
4545

@@ -70,7 +70,29 @@ publishing {
7070
artifact("$buildDir/outputs/aar/${artifactId}-release.aar")
7171

7272
pom.withXml {
73-
// ignore dependencies to force consumers to specify version
73+
def dependencies = asNode().appendNode('dependencies')
74+
75+
configurations.getByName("_releaseCompile").allDependencies.each {
76+
def dependency = dependencies.appendNode('dependency')
77+
78+
dependency.appendNode('groupId', it.group)
79+
dependency.appendNode('artifactId', it.name)
80+
dependency.appendNode('version', it.version)
81+
82+
if (it.excludeRules.size() > 0) {
83+
def exclusions = dependency.appendNode('exclusions')
84+
85+
it.excludeRules.each { ExcludeRule rule ->
86+
def exclusion = exclusions.appendNode('exclusion')
87+
88+
exclusion.appendNode('groupId', rule.group)
89+
90+
if (rule.module != null) {
91+
exclusion.appendNode('artifactId', rule.module)
92+
}
93+
}
94+
}
95+
}
7496
}
7597
}
7698

@@ -99,6 +121,7 @@ bintray {
99121

100122
version {
101123
name = libraryVersion
124+
vcsTag = libraryVersion
102125
released = new Date()
103126
}
104127
}

rxloader/src/main/java/com/l4digital/rxloader/RxLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private void dispose() {
119119
}
120120
}
121121

122-
private DisposableSubscriber<T> createSubscriber() {
122+
private synchronized DisposableSubscriber<T> createSubscriber() {
123123
if (mSubscriber == null || mSubscriber.isDisposed()) {
124124
mSubscriber = new DisposableSubscriber<T>() {
125125

rxloader/src/main/java/com/l4digital/rxloader/RxLoaderCallbacks.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.os.Bundle;
2222

2323
import io.reactivex.Flowable;
24+
import io.reactivex.Observable;
2425
import io.reactivex.processors.BehaviorProcessor;
2526

2627
public class RxLoaderCallbacks<T> implements LoaderManager.LoaderCallbacks<T> {
@@ -32,6 +33,10 @@ public Flowable<T> getFlowable() {
3233
return createProcessor();
3334
}
3435

36+
public Observable<T> getObservable() {
37+
return createProcessor().toObservable();
38+
}
39+
3540
public RxLoaderCallbacks(RxLoader<T> loader) {
3641
mLoader = loader;
3742
}
@@ -67,7 +72,7 @@ public void onLoaderReset(Loader<T> loader) {
6772
mProcessor.onComplete();
6873
}
6974

70-
private BehaviorProcessor<T> createProcessor() {
75+
private synchronized BehaviorProcessor<T> createProcessor() {
7176
if (mProcessor == null || mProcessor.hasComplete()) {
7277
mProcessor = BehaviorProcessor.create();
7378
}

0 commit comments

Comments
 (0)