Kotlin 1.4.21 (#45)

* Add tests for DeferredDrawable equality * Kotlin 1.4.21 * Extra Care 0.5.0 * Dokka 1.4.20 * AGP 4.1.1 * Truth 1.1 * Binary compatibility validator 0.3.0 * Switch to Gradle binary distribution
Backbase · Jan 16, 2021 · 2c5ce36 · 2c5ce36
1 parent 5f6e8bd
commit 2c5ce36
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     //region Dependency declarations
     ext.versions = [
         jaCoCo: '0.8.4',
-        kotlin: '1.4.10',
+        kotlin: '1.4.21',
     ]
 
     ext.deps = [
@@ -14,18 +14,18 @@ buildscript {
         coroutines: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6',
         junit: 'junit:junit:4.13',
         junitAndroidX: 'androidx.test.ext:junit-ktx:1.1.2',
-        truth: 'com.google.truth:truth:1.0.1',
+        truth: 'com.google.truth:truth:1.1',
     ]
     //endregion
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
-        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.10'
-        classpath 'org.jetbrains.kotlinx:binary-compatibility-validator:0.2.3'
+        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.20'
+        classpath 'org.jetbrains.kotlinx:binary-compatibility-validator:0.3.0'
 
-        classpath 'dev.drewhamilton.extracare:extracare-gradle-plugin:0.3.1'
+        classpath 'dev.drewhamilton.extracare:extracare-gradle-plugin:0.5.0'
     }
 
     repositories {
@@ -58,7 +58,6 @@ allprojects { project ->
     project.plugins.withType(com.android.build.gradle.LibraryPlugin) {
         //region Disable BuildConfig for libraries
         project.android.libraryVariants.all { variant ->
-            // TODO WORKAROUND: Replace with https://issuetracker.google.com/issues/72050365 once released.
             variant.generateBuildConfigProvider.get().enabled = false
         }
         //endregion

diff --git a/...red-resources/src/androidTest/java/com/backbase/deferredresources/DeferredDrawableTest.kt b/...red-resources/src/androidTest/java/com/backbase/deferredresources/DeferredDrawableTest.kt
@@ -78,6 +78,14 @@ internal class DeferredDrawableTest {
         assertThat(resolved.gradientRadiusCompat).isEqualTo(0.3f)
     }
 
+    @Test fun resource_withDefaultTransformations_isEquals() {
+        val deferred1 = DeferredDrawable.Resource(R.drawable.oval)
+        val deferred2 = DeferredDrawable.Resource(R.drawable.oval)
+        assertThat(deferred1).isEqualTo(deferred2)
+        assertThat(deferred2).isEqualTo(deferred1)
+        assertThat(deferred1.hashCode()).isEqualTo(deferred2.hashCode())
+    }
+
     @Test fun attribute_withMutateFalse_resolvesWithContext() {
         assumeFalse(
             "XML drawable does not have correct radius on API 21 and 22",
@@ -127,6 +135,14 @@ internal class DeferredDrawableTest {
         assertThat(resolved.gradientRadiusCompat).isEqualTo(0.3f)
     }
 
+    @Test fun attribute_withDefaultTransformations_isEquals() {
+        val deferred1 = DeferredDrawable.Attribute(android.R.attr.homeAsUpIndicator)
+        val deferred2 = DeferredDrawable.Attribute(android.R.attr.homeAsUpIndicator)
+        assertThat(deferred1).isEqualTo(deferred2)
+        assertThat(deferred2).isEqualTo(deferred1)
+        assertThat(deferred1.hashCode()).isEqualTo(deferred2.hashCode())
+    }
+
     internal companion object {
 
         @JvmStatic internal val GradientDrawable.gradientRadiusCompat: Float

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists