From cff9f720eeb282f335521b7f2ee065ea011a1d23 Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Sun, 5 Sep 2021 22:31:18 -0700 Subject: [PATCH] Bump dependencies and bump AGP to 7.0.2 --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- text-drawable/build.gradle.kts | 4 ---- token-data/build.gradle.kts | 2 -- token-images/build.gradle.kts | 4 ---- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8679993..ff4dd87 100644 --- 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 index f1ad1e6..9695fc5 100644 --- 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 index 402a2d8..02e57bb 100644 --- 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 index a01fbec..2395970 100644 --- 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 index aff82cc..f0a73db 100644 --- 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 index a01fbec..2395970 100644 --- 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")