From 2e0ebd84b48da63150d35d0a488b88dc8b00f00f Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Mon, 1 Aug 2022 13:25:56 -0700 Subject: [PATCH] Update compileSdk and targetSdk to API 33 Change-Id: I2e73265ab2b8a570712b3806913eaff1e17236ec --- .../main/kotlin/AndroidApplicationConventionPlugin.kt | 2 +- .../src/main/kotlin/AndroidLibraryConventionPlugin.kt | 2 +- gradle/libs.versions.toml | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 698bf7a79..fe7df5c77 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -30,7 +30,7 @@ class AndroidApplicationConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = 32 + defaultConfig.targetSdk = 33 } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 6b2861fde..66c918492 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -34,7 +34,7 @@ class AndroidLibraryConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = 32 + defaultConfig.targetSdk = 33 configureFlavors(this) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b860825c1..0c09ab117 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,8 +22,10 @@ androidxProfileinstaller = "1.2.0" androidxSavedState = "1.2.0" androidxStartup = "1.1.1" androidxWindowManager = "1.0.0" -androidxTest = "1.4.0" +androidxTestCore = "1.5.0-alpha02" androidxTestExt = "1.1.3" +androidxTestRunner = "1.4.0" +androidxTestRules = "1.4.0" androidxTracing = "1.1.0" androidxUiAutomator = "2.2.0" androidxWork = "2.7.1" @@ -83,11 +85,11 @@ androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profi androidx-savedstate-ktx = { group = "androidx.savedstate", name = "savedstate-ktx", version.ref= "androidxSavedState"} androidx-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidxStartup" } androidx-window-manager = {module = "androidx.window:window", version.ref = "androidxWindowManager"} -androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTest" } +androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" } androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" } androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" } -androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTest" } -androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" } +androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } +androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidxUiAutomator" } androidx-tracing-ktx = {group = "androidx.tracing", name="tracing-ktx", version.ref = "androidxTracing" } androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWork" }