From 6532255c49354ff516ab896c5b44ba0fad84f96d Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Tue, 7 Mar 2017 14:26:18 +0000 Subject: [PATCH 1/4] =?UTF-8?q?ButterKnife=208.4.0=20=E2=86=92=208.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 58e5a473..4b7410f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,6 +85,7 @@ repositories { dependencies { ext { + butterKnifeVersion = '8.5.1' supportVerion = "25.2.0" firebase = "10.2.0" thirtyinchVersion = '0.8.0-rc2' @@ -107,8 +108,8 @@ dependencies { compile 'com.firebase:firebase-jobdispatcher:0.5.2' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' compile 'de.hdodenhof:circleimageview:2.1.0' - compile 'com.jakewharton:butterknife:8.4.0' compile 'frankiesardo:icepick:3.1.0' + compile "com.jakewharton:butterknife:${butterKnifeVersion}" compile 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.1-rc1' compile 'io.reactivex:rxandroid:1.2.1' compile 'io.reactivex:rxjava:1.2.2' @@ -120,7 +121,7 @@ dependencies { compile 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2' apt 'org.projectlombok:lombok:1.12.6' apt 'frankiesardo:icepick-processor:3.1.0' - apt 'com.jakewharton:butterknife-compiler:8.4.0' + apt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" provided 'org.projectlombok:lombok:1.12.6' } From f8c6e4542b8bf4d7840c967927ce4a162c4a4799 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Tue, 7 Mar 2017 14:45:00 +0000 Subject: [PATCH 2/4] =?UTF-8?q?Icepick=203.1.0=20=E2=86=92=203.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4b7410f2..ec3abb6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,6 +86,7 @@ repositories { dependencies { ext { butterKnifeVersion = '8.5.1' + icepickVersion = '3.2.0' supportVerion = "25.2.0" firebase = "10.2.0" thirtyinchVersion = '0.8.0-rc2' @@ -108,7 +109,7 @@ dependencies { compile 'com.firebase:firebase-jobdispatcher:0.5.2' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' compile 'de.hdodenhof:circleimageview:2.1.0' - compile 'frankiesardo:icepick:3.1.0' + compile "frankiesardo:icepick:${icepickVersion}" compile "com.jakewharton:butterknife:${butterKnifeVersion}" compile 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.1-rc1' compile 'io.reactivex:rxandroid:1.2.1' @@ -120,9 +121,9 @@ dependencies { compile 'uk.co.samuelwall:material-tap-target-prompt:1.9.2' compile 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2' apt 'org.projectlombok:lombok:1.12.6' - apt 'frankiesardo:icepick-processor:3.1.0' + apt "frankiesardo:icepick-processor:${icepickVersion}" apt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" provided 'org.projectlombok:lombok:1.12.6' } -apply plugin: "com.google.gms.google-services" \ No newline at end of file +apply plugin: "com.google.gms.google-services" From e8d5f4d3976a491c551eafcfd73a697a1c41cc62 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Tue, 7 Mar 2017 14:53:18 +0000 Subject: [PATCH 3/4] Add property for lombokVersion Easier to change if you only have to adjust one line. --- app/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ec3abb6a..575508ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,6 +87,7 @@ dependencies { ext { butterKnifeVersion = '8.5.1' icepickVersion = '3.2.0' + lombokVersion = '1.12.6' supportVerion = "25.2.0" firebase = "10.2.0" thirtyinchVersion = '0.8.0-rc2' @@ -120,10 +121,10 @@ dependencies { compile 'com.github.GrenderG:Toasty:1.1.3' compile 'uk.co.samuelwall:material-tap-target-prompt:1.9.2' compile 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2' - apt 'org.projectlombok:lombok:1.12.6' + apt "org.projectlombok:lombok:${lombokVersion}" apt "frankiesardo:icepick-processor:${icepickVersion}" apt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" - provided 'org.projectlombok:lombok:1.12.6' + provided "org.projectlombok:lombok:${lombokVersion}" } apply plugin: "com.google.gms.google-services" From 6a5b8adfebeb138385965a6670c82db8ad7a7f82 Mon Sep 17 00:00:00 2001 From: Jonathan Caryl Date: Tue, 7 Mar 2017 15:53:54 +0000 Subject: [PATCH 4/4] Add gradle-versions-plugin to make it easier to keep track of upgraded SDKs in the future --- app/build.gradle | 1 + build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 575508ad..2b40b9d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'me.tatarka.retrolambda' apply plugin: "com.neenbedankt.android-apt" apply plugin: 'com.siimkinks.sqlitemagic' apply plugin: 'com.google.firebase.firebase-crash' +apply plugin: 'com.github.ben-manes.versions' android { signingConfigs { diff --git a/build.gradle b/build.gradle index b07403a7..3f801898 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ buildscript { classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' classpath 'com.siimkinks.sqlitemagic:sqlitemagic-plugin:0.11.0' classpath 'com.google.firebase:firebase-plugins:1.0.5' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0' } configurations.classpath.exclude group: 'com.android.tools.external.lombok' }