Skip to content

Commit bc2b84f

Browse files
authored
Compile against SDK 36 (#2062)
1 parent 6094527 commit bc2b84f

File tree

8 files changed

+12
-8
lines changed

8 files changed

+12
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Unreleased
99
- Support `@AssistedFactory` in code gen for Metro.
1010
- Add seekable transition support to `AnimatedOverlay`.
1111
- Add predictive back support to `FullScreenOverlay`.
12+
- Compile against Android SDK 36.
1213

1314
0.28.1
1415
------

build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ subprojects {
336336

337337
// Common android config
338338
val commonAndroidConfig: CommonExtension<*, *, *, *, *, *>.() -> Unit = {
339-
compileSdk = 35
339+
compileSdk = 36
340340

341341
if (hasCompose) {
342342
buildFeatures { compose = true }
@@ -361,7 +361,10 @@ subprojects {
361361
with(extensions.getByType<LibraryExtension>()) {
362362
commonAndroidConfig()
363363
defaultConfig { minSdk = 21 }
364-
testOptions { targetSdk = 35 }
364+
testOptions {
365+
// TODO update once robolectric supports it
366+
targetSdk = 35
367+
}
365368
}
366369

367370
// Single-variant libraries

samples/bottom-navigation/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
namespace = "com.slack.circuit.sample.navigation"
1515
defaultConfig {
1616
minSdk = 21
17-
targetSdk = 35
17+
targetSdk = 36
1818
}
1919
testOptions { unitTests { isIncludeAndroidResources = true } }
2020
}

samples/counter/apps/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
namespace = "com.slack.circuit.sample.counter.android"
1414
defaultConfig {
1515
minSdk = 31 // For the dynamic m3 theme
16-
targetSdk = 35
16+
targetSdk = 36
1717
}
1818
}
1919

samples/interop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
namespace = "com.slack.circuit.sample.interop"
1212
defaultConfig {
1313
minSdk = 28
14-
targetSdk = 35
14+
targetSdk = 36
1515
versionCode = 1
1616
versionName = "1"
1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

samples/star/apk/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
namespace = "com.slack.circuit.sample.star.apk"
1111
defaultConfig {
1212
minSdk = 28
13-
targetSdk = 35
13+
targetSdk = 36
1414
versionCode = 1
1515
versionName = "1"
1616
}

samples/star/benchmark/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val isCi = providers.environmentVariable("CI").isPresent
1616
android {
1717
namespace = "com.circuit.samples.star.benchmark"
1818
defaultConfig {
19-
targetSdk = 35
19+
targetSdk = 36
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
}
2222

samples/tutorial/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
namespace = "com.slack.circuit.tutorial"
1414
defaultConfig {
1515
minSdk = 21
16-
targetSdk = 35
16+
targetSdk = 36
1717
}
1818
}
1919

0 commit comments

Comments
 (0)