From 25bd1b90509fe2b979e3461e0015f71085cb5dc9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 29 Feb 2020 17:47:29 -0800 Subject: Update versions --- buildSrc/src/main/kotlin/kau/Versions.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'buildSrc/src') diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index 95955e0..a90d80e 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -57,7 +57,7 @@ object Versions { const val materialDialog = "3.3.0" // https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md - const val koin = "2.0.1" + const val koin = "2.1.0" // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google const val espresso = "3.2.0" @@ -72,7 +72,7 @@ object Versions { // Keep version for now, see https://github.com/diffplug/spotless/issues/521 // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md - const val spotless = "3.26.1" + const val spotless = "3.27.1" // https://github.com/bugsnag/bugsnag-android/releases const val bugsnag = "4.22.3" @@ -81,15 +81,15 @@ object Versions { const val bugsnagPlugin="4.7.3" // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google - const val gradlePlugin = "3.6.0-rc03" + const val gradlePlugin = "4.0.0-beta01" // https://github.com/dcendents/android-maven-gradle-plugin/releases const val mavenPlugin = "2.1" // https://github.com/Triple-T/gradle-play-publisher/releases - const val playPublishPlugin = "2.6.2" + const val playPublishPlugin = "2.7.2" // https://github.com/KeepSafe/dexcount-gradle-plugin/releases const val dexCountPlugin = "1.0.2" // https://github.com/gladed/gradle-android-git-version/releases - const val gitVersionPlugin = "0.4.12" + const val gitVersionPlugin = "0.4.13" } \ No newline at end of file -- cgit v1.2.3 From eb4c4ae2aa084179881dac92bb3469f326545e04 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 29 Feb 2020 18:10:34 -0800 Subject: Remove explicit build tools and update viewbinding api usage --- android-lib.gradle | 1 - buildSrc/src/main/kotlin/kau/Versions.kt | 3 --- fastadapter-viewbinding/build.gradle | 4 ++-- sample/build.gradle | 5 ++--- 4 files changed, 4 insertions(+), 9 deletions(-) (limited to 'buildSrc/src') diff --git a/android-lib.gradle b/android-lib.gradle index aa8aad7..bc97f11 100644 --- a/android-lib.gradle +++ b/android-lib.gradle @@ -10,7 +10,6 @@ group = "ca.allanwang" android { compileSdkVersion Versions.targetSdk - buildToolsVersion Versions.buildTools androidGitVersion { codeFormat = 'MMNNPPXX' diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index a90d80e..8a94a83 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -5,9 +5,6 @@ object Versions { const val minSdk = 21 const val targetSdk = 29 - // https://developer.android.com/studio/releases/build-tools - const val buildTools = "29.0.0" - // https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google const val appcompat = "1.1.0" diff --git a/fastadapter-viewbinding/build.gradle b/fastadapter-viewbinding/build.gradle index a786edb..ad1a0a2 100644 --- a/fastadapter-viewbinding/build.gradle +++ b/fastadapter-viewbinding/build.gradle @@ -6,8 +6,8 @@ ext.kauSubModuleMinSdk = Versions.coreMinSdk apply from: '../android-lib.gradle' android { - viewBinding { - enabled = true + buildFeatures { + viewBinding = true } } diff --git a/sample/build.gradle b/sample/build.gradle index 77165e8..96ed78f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -12,7 +12,6 @@ play { android { compileSdkVersion kau.Versions.targetSdk - buildToolsVersion kau.Versions.buildTools androidGitVersion { codeFormat = 'MMNNPPXX' @@ -28,8 +27,8 @@ android { multiDexEnabled true testInstrumentationRunner "ca.allanwang.kau.sample.SampleTestRunner" } - viewBinding { - enabled = true + buildFeatures { + viewBinding = true } def releaseSigning = file("../files/kau.properties") -- cgit v1.2.3 From 4f34109fe93ba4654be19bbe37fcd30c76a0b9c7 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 29 Feb 2020 18:19:47 -0800 Subject: Add leak canary --- buildSrc/src/main/kotlin/kau/Dependencies.kt | 2 ++ buildSrc/src/main/kotlin/kau/Versions.kt | 3 +++ docs/Migration.md | 5 +++++ 3 files changed, 10 insertions(+) (limited to 'buildSrc/src') diff --git a/buildSrc/src/main/kotlin/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt index b543dc3..d7a3757 100644 --- a/buildSrc/src/main/kotlin/kau/Dependencies.kt +++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt @@ -101,6 +101,8 @@ object Dependencies { const val bugsnag = "com.bugsnag:bugsnag-android:${Versions.bugsnag}" + const val leakCanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanary}" + @JvmStatic fun espresso(type: String) = "androidx.test.espresso:espresso-$type:${Versions.espresso}" diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index 8a94a83..3ff23cb 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -56,6 +56,9 @@ object Versions { // https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md const val koin = "2.1.0" + // https://square.github.io/leakcanary/changelog/ + const val leakCanary = "2.2" + // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google const val espresso = "3.2.0" diff --git a/docs/Migration.md b/docs/Migration.md index 0941667..7d50456 100644 --- a/docs/Migration.md +++ b/docs/Migration.md @@ -18,6 +18,11 @@ meaning that in memory preferences will reset to default. Previously, in memory `configBuilder` was previously required in the constructor, but is now an open function so that activity fields can be used in the builder. +## Gradle + +* Due to Spotless updates, gradle should not include the `clean` task ([#521](https://github.com/diffplug/spotless/issues/521)). +* `buildToolsVersion` is already included in Android Studio, so you no longer need to specify the link with KAU. + # v5.1.0 ## KPref -- cgit v1.2.3