Skip to content

Compile against SDK 36 #2062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Compile against SDK 36 #2062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Changelog
Unreleased
----------

- Fix the provided `Modifier` not being used in `NavigatorDefaults.EmptyDecoration`
- Fix the provided `Modifier` not being used in `NavigatorDefaults.EmptyDecoration`.
- Compile against Android SDK 36.

0.27.1
------
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ subprojects {

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

if (hasCompose) {
buildFeatures { compose = true }
Expand All @@ -371,7 +371,7 @@ subprojects {
with(extensions.getByType<LibraryExtension>()) {
commonAndroidConfig()
defaultConfig { minSdk = 21 }
testOptions { targetSdk = 35 }
testOptions { targetSdk = 36 }
}

// Single-variant libraries
Expand Down
2 changes: 1 addition & 1 deletion samples/bottom-navigation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ android {
namespace = "com.slack.circuit.sample.navigation"
defaultConfig {
minSdk = 21
targetSdk = 35
targetSdk = 36
}
testOptions { unitTests { isIncludeAndroidResources = true } }
}
Expand Down
2 changes: 1 addition & 1 deletion samples/counter/apps/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
namespace = "com.slack.circuit.sample.counter.android"
defaultConfig {
minSdk = 31 // For the dynamic m3 theme
targetSdk = 35
targetSdk = 36
}
}

Expand Down
2 changes: 1 addition & 1 deletion samples/interop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
namespace = "com.slack.circuit.sample.interop"
defaultConfig {
minSdk = 28
targetSdk = 35
targetSdk = 36
versionCode = 1
versionName = "1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion samples/star/apk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
namespace = "com.slack.circuit.sample.star.apk"
defaultConfig {
minSdk = 28
targetSdk = 35
targetSdk = 36
versionCode = 1
versionName = "1"
}
Expand Down
2 changes: 1 addition & 1 deletion samples/star/benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ val isCi = providers.environmentVariable("CI").isPresent
android {
namespace = "com.circuit.samples.star.benchmark"
defaultConfig {
targetSdk = 35
targetSdk = 36
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
2 changes: 1 addition & 1 deletion samples/tutorial/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
namespace = "com.slack.circuit.tutorial"
defaultConfig {
minSdk = 21
targetSdk = 35
targetSdk = 36
}
}

Expand Down
Loading