Skip to content
This repository has been archived by the owner on Jan 5, 2023. It is now read-only.

Fix compile issues & other minor updates #406

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix compile issues & other minor updates #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3601d41
upgrade AGP to v7.0.2 & hilt AGP to v2.38.1, update to use const for …
Damercy Mar 12, 2022
9a2bbe2
Merge branch 'main' into fix_compile_error
Damercy Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions buildSrc/src/main/java/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions mobile/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down