From 3601d4171704e4a5c440818a197530ec91d99ae8 Mon Sep 17 00:00:00 2001 From: Damercy Date: Sun, 13 Mar 2022 01:32:09 +0530 Subject: [PATCH] upgrade AGP to v7.0.2 & hilt AGP to v2.38.1, update to use const for versionNaming & use properties instead of deprecated functions for minSdk, compileSdk & targetSdk --- buildSrc/src/main/java/Versions.kt | 10 +++++----- mobile/build.gradle.kts | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index e1933a9e4c..73979f0c3d 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -15,22 +15,22 @@ */ object Versions { - val versionName = "7.0.15" // X.Y.Z; X = Major, Y = minor, Z = Patch level - private val versionCodeBase = 70150 // XYYZZM; M = Module (tv, mobile) - val versionCodeMobile = versionCodeBase + 3 + const val versionName = "7.0.15" // X.Y.Z; X = Major, Y = minor, Z = Patch level + private const val versionCodeBase = 70150 // XYYZZM; M = Module (tv, mobile) + const val versionCodeMobile = versionCodeBase + 3 const val COMPILE_SDK = 30 const val TARGET_SDK = 30 const val MIN_SDK = 21 - const val ANDROID_GRADLE_PLUGIN = "7.0.0-beta05" + const val ANDROID_GRADLE_PLUGIN = "7.0.2" const val BENCHMARK = "1.0.0" const val COMPOSE = "1.0.0-beta04" const val FIREBASE_CRASHLYTICS = "2.3.0" const val GOOGLE_SERVICES = "4.3.3" const val KOTLIN = "1.4.32" const val NAVIGATION = "2.3.5" - const val HILT_AGP = "2.36" + const val HILT_AGP = "2.38.1" // TODO: Remove this once the version for // "org.threeten:threetenbp:${Versions.threetenbp}:no-tzdb" using java-platform in the diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index a9f3cf60b4..d5d05144dd 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -42,11 +42,11 @@ plugins { } android { - compileSdkVersion(Versions.COMPILE_SDK) + compileSdk=Versions.COMPILE_SDK defaultConfig { applicationId = "com.google.samples.apps.iosched" - minSdkVersion(Versions.MIN_SDK) - targetSdkVersion(Versions.TARGET_SDK) + minSdk = Versions.MIN_SDK + targetSdk = Versions.TARGET_SDK versionCode = Versions.versionCodeMobile versionName = Versions.versionName testInstrumentationRunner = "com.google.samples.apps.iosched.tests.CustomTestRunner"