diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 758a5b44c8..2f113a7760 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -15,14 +15,15 @@ */ 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 = 31 const val TARGET_SDK = 30 const val MIN_SDK = 21 + const val ANDROID_GRADLE_PLUGIN = "7.1.2" const val BENCHMARK = "1.0.0" const val COMPOSE = "1.1.1" @@ -31,7 +32,6 @@ object Versions { const val KOTLIN = "1.6.10" const val NAVIGATION = "2.4.1" const val HILT_AGP = "2.40.5" - // TODO: Remove this once the version for // "org.threeten:threetenbp:${Versions.threetenbp}:no-tzdb" using java-platform in the // depconstraints/build.gradle.kts is defined diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 1d7bb61245..f24d70bdaa 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -24,11 +24,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"