Update to Compile SDK 34 (#676)

slackhq · Jun 15, 2023 · cfcb6e6 · cfcb6e6
1 parent e35b182
commit cfcb6e6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -255,7 +255,13 @@ subprojects {
 
   // Common android config
   val commonAndroidConfig: CommonExtension<*, *, *, *>.() -> Unit = {
-    compileSdk = 33
+    // Don't force compile SDK 34 yet in circuit artifacts yet
+    compileSdk =
+      if (project.path.startsWith(":samples")) {
+        34
+      } else {
+        33
+      }
 
     if (hasCompose) {
       buildFeatures { compose = true }

diff --git a/gradle.properties b/gradle.properties
@@ -28,6 +28,8 @@ android.useAndroidX=true
 android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,\
   android.experimental.testOptions.emulatorSnapshots.maxSnapshotsForTestFailures
 
+android.suppressUnsupportedCompileSdk=34
+
 # Disabled as this has no benefits in studio builds and only marginal benefits in command line, but
 # can cause problems with Kotlin Gradle DSL. We're observing this for a week to see if/how it affects
 # metrics.

diff --git a/samples/counter/apps/build.gradle.kts b/samples/counter/apps/build.gradle.kts
@@ -12,9 +12,8 @@ plugins {
 android {
   namespace = "com.slack.circuit.sample.counter.android"
   defaultConfig {
-    compileSdk = 33
-    minSdk = 33
-    targetSdk = 33
+    minSdk = 31 // For the dynamic m3 theme
+    targetSdk = 34
   }
 }
 

diff --git a/samples/interop/build.gradle.kts b/samples/interop/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 android {
   namespace = "com.slack.circuit.sample.interop"
   defaultConfig {
-    minSdk = 33
-    targetSdk = 33
+    minSdk = 28
+    targetSdk = 34
     versionCode = 1
     versionName = "1"
   }

diff --git a/samples/star/apk/build.gradle.kts b/samples/star/apk/build.gradle.kts
@@ -10,7 +10,7 @@ android {
   namespace = "com.slack.circuit.sample.star.apk"
   defaultConfig {
     minSdk = 28
-    targetSdk = 33
+    targetSdk = 34
     versionCode = 1
     versionName = "1"
   }

diff --git a/samples/star/benchmark/build.gradle.kts b/samples/star/benchmark/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 android {
   namespace = "com.circuit.samples.star.benchmark"
   defaultConfig {
-    targetSdk = 33
+    targetSdk = 34
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
     // TODO temporary until AGP 8.2, which no longer requires this.

diff --git a/samples/tacos/build.gradle.kts b/samples/tacos/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 android {
   namespace = "com.slack.circuit.tacos"
 
-  defaultConfig { minSdk = 33 }
+  defaultConfig { minSdk = 28 }
 
   testOptions { unitTests.isIncludeAndroidResources = true }
 }