-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #124 from kirillzh/update-to-latest-and-greatest
Use latest and greatest tools and libraries
- Loading branch information
Showing
24 changed files
with
124 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,50 +1,55 @@ | ||
buildscript { | ||
repositories { | ||
mavenCentral() | ||
jcenter() | ||
maven { url 'https://plugins.gradle.org/m2/' } | ||
} | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:2.3.0' | ||
classpath 'me.tatarka:gradle-retrolambda:3.3.0' | ||
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.10' | ||
} | ||
} | ||
|
||
allprojects { | ||
repositories { | ||
mavenCentral() | ||
jcenter() | ||
} | ||
ext { | ||
minSdkVersion = 9 | ||
targetSdkVersion = 28 | ||
compileSdkVersion = 28 | ||
buildToolsVersion = '28.0.3' | ||
javaVersion = JavaVersion.VERSION_1_7 | ||
java8Version = JavaVersion.VERSION_1_8 | ||
butterknifeVersion = '10.1.0' | ||
} | ||
|
||
tasks.withType(JavaCompile) { | ||
options.compilerArgs += ['-Xlint:all', '-Xlint:-processing', '-Werror'] | ||
} | ||
repositories { | ||
mavenCentral() | ||
google() | ||
jcenter() | ||
} | ||
|
||
apply plugin: 'net.ltgt.errorprone' | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:3.3.2' | ||
classpath "com.jakewharton:butterknife-gradle-plugin:${butterknifeVersion}" | ||
} | ||
} | ||
|
||
group = GROUP | ||
version = VERSION_NAME | ||
plugins { | ||
id("net.ltgt.errorprone") version "0.7.1" | ||
} | ||
|
||
ext { | ||
minSdkVersion = 9 | ||
targetSdkVersion = 25 | ||
compileSdkVersion = 25 | ||
buildToolsVersion = '25.0.2' | ||
javaVersion = JavaVersion.VERSION_1_7 | ||
java8Version = JavaVersion.VERSION_1_8 | ||
allprojects { | ||
repositories { | ||
mavenCentral() | ||
google() | ||
jcenter() | ||
} | ||
|
||
tasks.withType(JavaCompile) { | ||
options.compilerArgs += ['-Xlint:all', '-Xlint:-processing', '-Werror'] | ||
} | ||
|
||
group = GROUP | ||
version = VERSION_NAME | ||
} | ||
|
||
ext.deps = [ | ||
annotations: 'com.android.support:support-annotations:25.1.1', | ||
rxjava: 'io.reactivex.rxjava2:rxjava:2.0.3', | ||
rxandroid: 'io.reactivex.rxjava2:rxandroid:2.0.1', | ||
rxbinding: 'com.jakewharton.rxbinding:rxbinding:0.3.0', | ||
rxjava2interop: 'com.github.akarnokd:rxjava2-interop:0.4.0', | ||
butterknife: 'com.jakewharton:butterknife:8.4.0', | ||
butterknifeCompiler: 'com.jakewharton:butterknife-compiler:8.4.0', | ||
junit: 'junit:junit:4.12', | ||
assertj: 'org.assertj:assertj-core:1.7.0', | ||
robolectric: 'org.robolectric:robolectric:3.0', | ||
annotations : 'androidx.annotation:annotation:1.0.2', | ||
rxjava2 : 'io.reactivex.rxjava2:rxjava:2.2.7', | ||
rxandroid : 'io.reactivex.rxjava2:rxandroid:2.1.1', | ||
rxbinding : 'com.jakewharton.rxbinding:rxbinding:1.0.1', | ||
rxjava2interop : 'com.github.akarnokd:rxjava2-interop:0.13.5', | ||
butterknife : "com.jakewharton:butterknife:${ext.butterknifeVersion}", | ||
butterknifeCompiler: "com.jakewharton:butterknife-compiler:${ext.butterknifeVersion}", | ||
junit : 'junit:junit:4.12', | ||
assertj : 'org.assertj:assertj-core:3.12.2', | ||
robolectric : 'org.robolectric:robolectric:4.2.1', | ||
testcore : 'androidx.test:core:1.0.0' | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
#Tue Mar 14 01:37:42 PDT 2017 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
<manifest package="com.f2prateek.rx.preferences2"> | ||
<application/> | ||
</manifest> | ||
<manifest package="com.f2prateek.rx.preferences2"/> |
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/BooleanAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/ConverterAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/EnumAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/FloatAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/IntegerAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/LongAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletions
6
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/Preference.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletions
10
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/RealPreference.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
rx-preferences/src/main/java/com/f2prateek/rx/preferences2/StringAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
rx-preferences/src/test/java/com/f2prateek/rx/preferences2/PointPreferenceConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.