Merge pull request #944 from square/sedwards/compile-sdk-33

compileSdkVersion 33; androidx.activity/appcompat upgrades; transitives

Author: steve-the-edwards

benchmarks/dungeon-benchmark/build.gradle.kts

@@ -1,3 +1,6 @@
+import com.squareup.workflow1.libsCatalog
+import com.squareup.workflow1.version
+
 plugins {
   id("com.android.test")
   id("org.jetbrains.kotlin.android")
@@ -7,7 +10,7 @@ plugins {
 // dependencies that those include.
 
 android {
-  compileSdk = 32
+  compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -21,7 +24,7 @@ android {
 
   defaultConfig {
     minSdk = 23
-    targetSdk = 32
+    targetSdk = libsCatalog.version("targetSdk").toInt()
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }

benchmarks/performance-poetry/complex-benchmark/build.gradle.kts

@@ -1,3 +1,6 @@
+import com.squareup.workflow1.libsCatalog
+import com.squareup.workflow1.version
+
 plugins {
   id("com.android.test")
   id("org.jetbrains.kotlin.android")
@@ -7,7 +10,7 @@ plugins {
 // dependencies that those include.
 
 android {
-  compileSdk = 32
+  compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -21,7 +24,7 @@ android {
 
   defaultConfig {
     minSdk = 26
-    targetSdk = 32
+    targetSdk = libsCatalog.version("targetSdk").toInt()
 
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }

benchmarks/performance-poetry/complex-poetry/build.gradle.kts

@@ -1,10 +1,13 @@
+import com.squareup.workflow1.libsCatalog
+import com.squareup.workflow1.version
+
 plugins {
   id("com.android.application")
   `kotlin-android`
   id("kotlin-parcelize")
 }
 android {
-  compileSdk = 32
+  compileSdk = libsCatalog.version("compileSdk").toInt()
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -16,7 +19,7 @@ android {
   }
 
   defaultConfig {
-    targetSdk = 32
+    targetSdk = libsCatalog.version("targetSdk").toInt()
     minSdk = 29
     applicationId = "com.squareup.benchmarks.performance.complex.poetry"
 

buildSrc/src/main/java/Versions.kt

@@ -1,5 +1,5 @@
 @Suppress("UNUSED") // used in Groovy convention scripts
 object Versions {
-  const val compileSdk = 31
-  const val targetSdk = 30
+  const val compileSdk = 33
+  const val targetSdk = 33
 }

buildSrc/src/main/java/android-defaults.gradle.kts

@@ -1,16 +1,18 @@
 import com.android.build.gradle.TestedExtension
+import com.squareup.workflow1.libsCatalog
+import com.squareup.workflow1.version
 
 configure<TestedExtension> {
-  compileSdkVersion(31)
+  compileSdkVersion(libsCatalog.version("compileSdk").toInt())
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 21
-    targetSdk = 30
+    minSdk = libsCatalog.version("minSdk").toInt()
+    targetSdk = libsCatalog.version("targetSdk").toInt()
     versionCode = 1
     versionName = "1.0"
   }

buildSrc/src/main/java/android-sample-app.gradle.kts

@@ -1,4 +1,5 @@
 import com.android.build.gradle.TestedExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.squareup.workflow1.library
 import com.squareup.workflow1.libsCatalog
 
@@ -11,6 +12,12 @@ configure<TestedExtension> {
   buildFeatures.viewBinding = true
 }
 
+configure<BaseAppModuleExtension> {
+  lint {
+    baseline = file("lint-baseline.xml")
+  }
+}
+
 dependencies {
   "implementation"(project(":workflow-core"))
   "implementation"(project(":workflow-runtime"))

buildSrc/src/main/java/android-ui-tests.gradle.kts

@@ -9,7 +9,6 @@ plugins {
 configure<TestedExtension> {
   defaultConfig {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    testInstrumentationRunnerArguments["listener"] = "leakcanary.FailTestOnLeakRunListener"
   }
 
   testOptions {

gradle/libs.versions.toml

@@ -2,31 +2,33 @@
 
 androidTools = "7.4.1"
 
-compileSdk = "31"
-minSdkVersion = "21"
-targetSdk = "30"
+compileSdk = "33"
+minSdk = "21"
+targetSdk = "33"
 
-androidx-activity = "1.3.0"
-androidx-appcompat = "1.3.1"
+androidx-activity = "1.6.1"
+androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.1.1"
 androidx-cardview = "1.0.0"
-androidx-compose = "1.1.0-rc01"
 androidx-compose-compiler = "1.3.2"
+# see https://developer.android.com/jetpack/compose/bom/bom-mapping
+androidx-compose-bom = "2023.01.00"
 androidx-constraintlayout = "2.1.4"
 androidx-core = "1.6.0"
 androidx-fragment = "1.3.6"
 androidx-gridlayout = "1.0.0"
-androidx-lifecycle = "2.4.0"
+androidx-lifecycle = "2.5.1"
 androidx-navigation = "2.4.0-alpha09"
 androidx-paging = "3.0.1"
 androidx-profileinstaller = "1.2.0-alpha02"
 androidx-recyclerview = "1.2.1"
 androidx-room = "2.4.0-alpha04"
 androidx-savedstate = "1.1.0"
 androidx-startup = "1.1.0"
-androidx-test = "1.3.0"
+androidx-test = "1.5.0"
 androidx-test-espresso = "3.3.0"
 androidx-test-junit-ext = "1.1.3"
+androidx-test-runner = "1.5.2"
 androidx-test-truth-ext = "1.4.0"
 androidx-tracing = "1.1.0"
 androidx-transition = "1.4.1"
@@ -64,14 +66,14 @@ mockito-core = "3.3.3"
 mockito-kotlin = "3.2.0"
 
 mockk = "1.11.0"
-robolectric = "4.6.1"
+robolectric = "4.9.2"
 
 rxjava2-android = "2.1.1"
 rxjava2-core = "2.2.21"
 
 squareup-curtains = "1.2.2"
 squareup-cycler = "0.1.9"
-squareup-leakcanary = "2.8.1"
+squareup-leakcanary = "2.10"
 squareup-moshi = "1.13.0"
 squareup-okhttp = "4.9.1"
 squareup-okio = "3.0.0"
@@ -115,20 +117,22 @@ androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "andr
 
 androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
 
-androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
-androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
+androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 
-androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation"}
+androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout"}
 
-androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
-androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable", version.ref = "androidx-compose" }
+androidx-compose-material = { module = "androidx.compose.material:material"}
 
-androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
-androidx-compose-ui-geometry = { module = "androidx.compose.ui:ui-geometry", version.ref = "androidx-compose" }
-androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "androidx-compose" }
-androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
-androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
-androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }
+androidx-compose-runtime = { module = "androidx.compose.runtime:runtime"}
+androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable"}
+
+androidx-compose-ui = { module = "androidx.compose.ui:ui"}
+androidx-compose-ui-geometry = { module = "androidx.compose.ui:ui-geometry"}
+androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics"}
+androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4"}
+androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling"}
+androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"}
 
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
 
@@ -160,7 +164,7 @@ androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core",
 androidx-test-espresso-idlingResource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx-test-espresso" }
 androidx-test-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx-test-espresso" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit-ext" }
-androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
+androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
 androidx-test-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-truth-ext" }
 
 androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"

samples/compose-samples/build.gradle.kts

@@ -20,7 +20,10 @@ android {
 }
 
 dependencies {
+  val composeBom = platform(libs.androidx.compose.bom)
+
   androidTestImplementation(libs.androidx.activity.core)
+  androidTestImplementation(composeBom)
   androidTestImplementation(libs.androidx.compose.ui)
   androidTestImplementation(libs.androidx.compose.ui.test.junit4)
   androidTestImplementation(libs.androidx.test.core)
@@ -33,6 +36,7 @@ dependencies {
 
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.activity.core)
+  implementation(composeBom)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.foundation.layout)
   implementation(libs.androidx.compose.material)

samples/compose-samples/lint-baseline.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="all" version="7.4.1">
+
+    <issue
+        id="DataExtractionRules"
+        message="The attribute `android:allowBackup` is deprecated from Android 12 and higher and may be removed in future versions. Consider adding the attribute `android:dataExtractionRules` specifying an `@xml` resource which configures cloud backups and device transfers on Android 12 and higher."
+        errorLine1="      android:allowBackup=&quot;false&quot;"
+        errorLine2="                           ~~~~~">
+        <location
+            file="src/main/AndroidManifest.xml"
+            line="6"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="HardcodedText"
+        message="Hardcoded string &quot;Legacy&quot;, should use `@string` resource"
+        errorLine1="      android:text=&quot;Legacy&quot;"
+        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/legacy_view.xml"
+            line="12"
+            column="7"/>
+    </issue>
+
+    <issue
+        id="RtlEnabled"
+        message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>