Skip to content

Commit b780143

Browse files
committed
Fix project import issue in Android Studio and a compilation failure
1 parent 9f8e3e8 commit b780143

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

rxjava-contrib/rxjava-android-samples-build-wrapper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks.build.doLast {
77
project.exec {
88
workingDir '../rxjava-android-samples'
99

10-
commandLine "./gradlew", "clean", "packageDebug", "-PrxjVersion=${version}"
10+
commandLine "./gradlew", "clean", "packageDebug"
1111
}
1212
}
1313
}

rxjava-contrib/rxjava-android-samples/samples/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,15 @@ android {
1818
}
1919
}
2020

21+
// make sure we always compile against the latest version of RxJava
22+
def rootProjectProperties = new Properties()
23+
file("../../../gradle.properties").withReader { reader ->
24+
rootProjectProperties.load(reader)
25+
properties.putAll(rootProjectProperties)
26+
}
27+
2128
dependencies {
29+
def rxjVersion = rootProjectProperties.get("version")
2230
compile "com.netflix.rxjava:rxjava-android:$rxjVersion"
2331
compile fileTree(dir: 'libs', include: ['*.jar'])
2432
}

rxjava-contrib/rxjava-android-samples/samples/src/main/java/com/netflix/rxjava/android/samples/RetainedFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public RetainedFragment() {
3636
public void onCreate(Bundle savedInstanceState) {
3737
super.onCreate(savedInstanceState);
3838

39-
strings = SampleObservables.numberStrings2().cache();
39+
strings = SampleObservables.numberStrings().cache();
4040
}
4141

4242
@Override

0 commit comments

Comments
 (0)