Permalink
Browse files

Update gradle and dependencies (#167)

  • Loading branch information...
apoi committed Dec 29, 2017
1 parent 786bc4d commit 03b3f824989f164e0665703bcebe01e6ed0be98c
Showing with 110 additions and 96 deletions.
  1. +2 −2 .travis.yml
  2. +1 −1 README.md
  3. +30 −13 app/build.gradle
  4. +26 −9 appbasic/build.gradle
  5. +29 −27 appshared/build.gradle
  6. +3 −19 build.gradle
  7. +2 −2 gradle/wrapper/gradle-wrapper.properties
  8. +17 −23 reark/build.gradle
@@ -11,8 +11,8 @@ android:
- platform-tools
- tools
- android-24
- android-25
- build-tools-25.0.2
- android-27
- build-tools-26.0.2
- extra-google-m2repository
- extra-android-m2repository
- sys-img-armeabi-v7a-android-24
@@ -40,7 +40,7 @@ repositories {
}
android {
compile 'io.reark:reark:0.2-ALPHA'
implementation 'io.reark:reark:0.2-ALPHA'
}
```
@@ -1,15 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'spoon'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
@@ -27,6 +25,7 @@ android {
}
}
buildTypes {
debug {}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), '../appshared/proguard-rules.pro'
@@ -43,18 +42,36 @@ android {
}
dependencies {
debugCompile project(path: ':appshared', configuration: 'debug')
releaseCompile project(path: ':appshared', configuration: 'release')
implementation project(':reark')
implementation project(':appshared')
// Support libraries
implementation 'com.android.support:appcompat-v7:27.0.2'
// RxJava
implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
// Retrofit
implementation 'com.squareup.okhttp3:okhttp-android-support:3.9.1'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
// Glide
implementation 'com.github.bumptech.glide:glide:3.8.0'
// Schematic
apt 'net.simonvt.schematic:schematic-compiler:0.7.0'
compile 'net.simonvt.schematic:schematic:0.7.0'
annotationProcessor 'net.simonvt.schematic:schematic-compiler:0.7.0'
implementation 'net.simonvt.schematic:schematic:0.7.0'
// Dagger
apt 'com.google.guava:guava:20.0'
apt 'com.google.dagger:dagger-compiler:2.8'
implementation 'com.google.dagger:dagger:2.13'
annotationProcessor 'com.google.guava:guava:23.0'
annotationProcessor 'com.google.dagger:dagger-compiler:2.13'
// Android test build
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestImplementation 'com.android.support.test:rules:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
}
@@ -1,14 +1,12 @@
apply plugin: 'com.android.application'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'com.neenbedankt.android-apt'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
@@ -24,6 +22,7 @@ android {
}
}
buildTypes {
debug {}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), '../appshared/proguard-rules.pro'
@@ -37,10 +36,28 @@ android {
}
dependencies {
debugCompile project(path: ':appshared', configuration: 'debug')
releaseCompile project(path: ':appshared', configuration: 'release')
implementation project(':appshared')
implementation project(':reark')
// Support libraries
implementation 'com.android.support:appcompat-v7:27.0.2'
// RxJava
implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
// Retrofit
implementation 'com.squareup.okhttp3:okhttp-android-support:3.9.1'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
// Glide
implementation 'com.github.bumptech.glide:glide:3.8.0'
// Dagger
apt 'com.google.guava:guava:20.0'
apt 'com.google.dagger:dagger-compiler:2.8'
implementation 'com.google.dagger:dagger:2.13'
annotationProcessor 'com.google.guava:guava:23.0'
annotationProcessor 'com.google.dagger:dagger-compiler:2.13'
}
@@ -1,25 +1,22 @@
apply plugin: 'com.android.library'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'com.neenbedankt.android-apt'
apply from: 'env-config.gradle'
def BOOL = "boolean"
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
publishNonDefault true
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
buildConfigField(BOOL, "IS_CI_BUILD", ci_build)
}
buildTypes {
debug {}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -35,37 +32,42 @@ android {
}
dependencies {
debugCompile project(path: ':reark', configuration: 'debug')
releaseCompile project(path: ':reark', configuration: 'release')
implementation project(':reark')
// Support libraries
compile 'com.android.support:recyclerview-v7:25.3.1'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:recyclerview-v7:27.0.2'
implementation 'com.android.support:support-annotations:27.0.2'
// Retrofit
compile 'com.squareup.okhttp3:okhttp-android-support:3.5.0'
compile 'com.squareup.retrofit2:retrofit:2.2.0'
compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
compile 'com.squareup.retrofit2:converter-gson:2.2.0'
implementation 'com.squareup.okhttp3:okhttp-android-support:3.9.1'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
// Glide
compile 'com.github.bumptech.glide:glide:3.7.0'
// RxAndroid and RxBinding
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
// Dagger
apt 'com.google.guava:guava:20.0'
compile 'com.google.dagger:dagger:2.8'
apt 'com.google.dagger:dagger-compiler:2.8'
implementation 'com.google.dagger:dagger:2.13'
annotationProcessor 'com.google.guava:guava:23.0'
annotationProcessor 'com.google.dagger:dagger-compiler:2.13'
// Glide
implementation 'com.github.bumptech.glide:glide:3.8.0'
// Stetho
debugCompile 'com.facebook.stetho:stetho:1.4.2'
debugCompile 'com.facebook.stetho:stetho-okhttp3:1.4.2'
debugImplementation 'com.facebook.stetho:stetho:1.5.0'
debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
// Leak tracing
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
// Unit test build
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:3.6.1'
testCompile 'org.powermock:powermock-api-mockito:1.6.6'
testCompile 'org.powermock:powermock-module-junit4:1.6.6'
testImplementation 'junit:junit:4.12'
testImplementation 'org.assertj:assertj-core:3.8.0'
testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
}
@@ -1,34 +1,18 @@
apply plugin: 'com.github.ben-manes.versions'
buildscript {
repositories {
mavenCentral()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'me.tatarka:gradle-retrolambda:3.4.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
}
}
allprojects {
repositories {
mavenCentral()
}
}
dependencyUpdates.resolutionStrategy = {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ['alpha', 'beta', 'rc'].any { qualifier ->
selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
}
if (rejected) {
selection.reject('Release candidate')
}
}
google()
}
}
@@ -1,6 +1,6 @@
#Tue Oct 11 23:58:23 CEST 2016
#Wed Dec 06 15:26:16 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
@@ -1,23 +1,22 @@
apply plugin: 'com.android.library'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'maven'
apply plugin: 'signing'
apply plugin: 'spoon'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
publishNonDefault true
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
}
buildTypes {
debug {}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -38,33 +37,28 @@ configurations {
dependencies {
// Support libraries
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-annotations:25.3.1'
// Retrofit
compile 'com.squareup.retrofit2:retrofit:2.2.0'
compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
compile 'com.squareup.retrofit2:converter-gson:2.2.0'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:support-annotations:27.0.2'
// RxJava
compile 'io.reactivex.rxjava2:rxjava:2.1.5'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
// RxBinding wrappers
compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
// Retrofit
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
// Unit test build
testCompile 'junit:junit:4.12'
testCompile 'org.powermock:powermock-api-mockito:1.6.6'
testCompile 'org.powermock:powermock-module-junit4:1.6.6'
testImplementation 'junit:junit:4.12'
testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
// Android test build
androidTestCompile 'com.android.support:support-annotations:25.3.1'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.android.support:support-annotations:27.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
// Javadoc generation needs dependencies in classpath
javadocDeps 'com.android.support:support-annotations:25.3.1'
javadocDeps 'io.reactivex.rxjava2:rxjava:2.1.5'
javadocDeps 'com.android.support:support-annotations:27.0.2'
javadocDeps 'io.reactivex.rxjava2:rxjava:2.1.7'
javadocDeps 'io.reactivex.rxjava2:rxandroid:2.0.1'
}

0 comments on commit 03b3f82

Please sign in to comment.