Merge pull request #250 from AllanWang/versions

Versions

12 files changed, 56 insertions, 23 deletions

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..eb2873e
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 69dabb2..bc49082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
   global:
   - ANDROID_API=29
   - EMULATOR_API=19
-  - ANDROID_BUILD_TOOLS=29.0.0
+  - ANDROID_BUILD_TOOLS=29.0.2
 git:
   depth: 500
 android:
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/build.gradle b/build.gradle
index cf8998f..3a880b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,6 @@ buildscript {
     wrapper.setDistributionType(Wrapper.DistributionType.ALL)
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
 task generateChangelogMd {
     ChangelogGenerator.generate("${project.rootDir}/sample/src/main/res/xml/kau_changelog.xml", "${project.rootDir}/docs/Changelog.md")
 }
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 95955e0..3ff23cb 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"
 
@@ -57,7 +54,10 @@ 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://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"
@@ -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
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
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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1ba7206..e812d50 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Feb 29 17:34:02 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
diff --git a/mediapicker/src/main/res/layout/kau_iitem_image_basic.xml b/mediapicker/src/main/res/layout/kau_iitem_image_basic.xml
index b89e41d..939f139 100644
--- a/mediapicker/src/main/res/layout/kau_iitem_image_basic.xml
+++ b/mediapicker/src/main/res/layout/kau_iitem_image_basic.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ca.allanwang.kau.ui.views.MeasuredImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/kau_image"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="2dp"
     android:foreground="@drawable/kau_selectable_white"
     android:scaleType="centerCrop"
-    app:relativeHeight="1" />
\ No newline at end of file
+    app:relativeHeight="1"
+    tools:ignore="UnusedAttribute" />
\ No newline at end of file
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")
diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt
index 2bf5ca3..c6ab259 100644
--- a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt
@@ -46,8 +46,7 @@ class SampleTestRule : TestRule {
             override fun evaluate() {
 
                 // Reset prefs
-                val pref: KPrefSample = get()
-                pref.reset()
+                get<KPrefSample>().reset()
 
                 base.evaluate()
             }