Bump dependencies and bump AGP to 7.0.2

helloworld1 · Sep 6, 2021 · cff9f72 · cff9f72
1 parent a6ed251
commit cff9f72
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:7.0.2")
         classpath(kotlin("gradle-plugin", version = Versions.KOTLIN))
         classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.HILT}")
     }

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,10 +1,10 @@
 object Versions {
-    const val KOTLIN = "1.5.10"
-    const val HILT = "2.38"
+    const val KOTLIN = "1.5.30"
+    const val HILT = "2.38.1"
     const val APP_COMPAT = "1.3.1"
-    const val ACTIVITY_KTX = "1.2.4"
-    const val MATERIAL = "1.3.0"
-    const val CORE_KTX = "1.5.0"
+    const val ACTIVITY_KTX = "1.3.1"
+    const val MATERIAL = "1.4.0"
+    const val CORE_KTX = "1.6.0"
     const val KOTLINX_COROUTINES = "1.5.1"
     const val LIFECYCLE_KTX = "2.3.1"
     const val CAMERAX = "1.0.1"
@@ -17,6 +17,6 @@ object Versions {
     const val ANDROIDX_TEST_CORE = "1.3.0"
     const val ANDROIDX_JUNIT = "1.1.2"
     const val ANDROIDX_TRUTH = "1.3.0"
-    const val ESPRESSO = "3.3.0"
+    const val ESPRESSO = "3.4.0"
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/text-drawable/build.gradle.kts b/text-drawable/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-
 plugins {
     id("com.android.library")
     kotlin("android")
@@ -11,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion(AppConfigs.MIN_SDK_VERSION)
         targetSdkVersion(AppConfigs.TARGET_SDK_VERSION)
-        versionCode = AppConfigs.VERSION_CODE
-        versionName = AppConfigs.VERSION_NAME
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/token-data/build.gradle.kts b/token-data/build.gradle.kts
@@ -11,8 +11,6 @@ android {
     defaultConfig {
         minSdkVersion(AppConfigs.MIN_SDK_VERSION)
         targetSdkVersion(AppConfigs.TARGET_SDK_VERSION)
-        versionCode = AppConfigs.VERSION_CODE
-        versionName = AppConfigs.VERSION_NAME
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/token-images/build.gradle.kts b/token-images/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-
 plugins {
     id("com.android.library")
     kotlin("android")
@@ -11,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion(AppConfigs.MIN_SDK_VERSION)
         targetSdkVersion(AppConfigs.TARGET_SDK_VERSION)
-        versionCode = AppConfigs.VERSION_CODE
-        versionName = AppConfigs.VERSION_NAME
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")