android: toolchain AGP 9.1.1 / Gradle 9.3.1 / Kotlin 2.2.21 / compileSdk 37, BOM 2026.09.00 + material3 1.5.0-beta01
Built-in Kotlin (kotlin-android removed), Java 11 compile options (compose 1.12), proguard-android-optimize.txt (the non-optimize file is rejected by AGP 9), ExposedDropdownMenu import, minSdk 23 kept via tools:overrideLibrary for material3 1.5 libs that declare minSdk 24. -PshortNdkCommands for deep worktree paths. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
65989b3a5a
commit
6fd03f37f7
6 files changed
+25
-22
No files matched your search
@@ -1,5 +1,4 @@
|
||||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'org.jetbrains.kotlin.plugin.compose'
|
||||
|
||||
/* Optional .env next to this project: S3/update settings and signing (see .env.example).
|
||||
@@ -42,9 +41,9 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
applicationId "one.shx.strongswan.ext"
|
||||
compileSdk = 36
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 36
|
||||
compileSdk = 37
|
||||
minSdk = 23
|
||||
targetSdk = 36
|
||||
|
||||
versionCode 159
|
||||
versionName "2.14.6"
|
||||
@@ -78,6 +77,10 @@ android {
|
||||
externalNativeBuild {
|
||||
ndkBuild {
|
||||
arguments '-j' + Runtime.runtime.availableProcessors()
|
||||
/* deep checkout paths (e.g. git worktrees) overflow the Windows command line; opt in with -PshortNdkCommands */
|
||||
if (project.hasProperty('shortNdkCommands')) {
|
||||
arguments 'APP_SHORT_COMMANDS=true', 'LOCAL_SHORT_COMMANDS=true'
|
||||
}
|
||||
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
|
||||
}
|
||||
}
|
||||
@@ -114,7 +117,7 @@ android {
|
||||
Smoke-test a release build on a device before publishing. */
|
||||
minifyEnabled true
|
||||
shrinkResources true
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'
|
||||
if (keystoreFile) {
|
||||
signingConfig signingConfigs.release
|
||||
} else {
|
||||
@@ -131,11 +134,8 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
targetCompatibility 1.8
|
||||
sourceCompatibility 1.8
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = '1.8'
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
}
|
||||
buildFeatures {
|
||||
compose true
|
||||
@@ -158,15 +158,15 @@ dependencies {
|
||||
/* BOM 2026.06.01 = compose-ui 1.11.4. The Expressive API (MaterialExpressiveTheme,
|
||||
MotionScheme.expressive, LoadingIndicator, MaterialShapes) lives only in
|
||||
material3 1.5.0-alpha/beta, so material3 is pinned explicitly.
|
||||
1.5.0-alpha18 is the newest line that still builds with AGP 8.13 / compileSdk 36:
|
||||
1.5.0-beta01 is the newest line that still builds with AGP 8.13 / compileSdk 36:
|
||||
alpha19+ (and 1.5.0-beta01, BOM 2026.09.00 = compose 1.12) require AGP 9.1 and
|
||||
compileSdk 37. Unpin once those are adopted and 1.5.0 is stable. */
|
||||
def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
|
||||
def composeBom = platform('androidx.compose:compose-bom:2026.09.00')
|
||||
implementation composeBom
|
||||
implementation 'androidx.compose.ui:ui'
|
||||
implementation 'androidx.compose.material3:material3:1.5.0-alpha18'
|
||||
implementation 'androidx.compose.material3:material3:1.5.0-beta01'
|
||||
/* adaptive-navigation-suite (NavigationSuiteScaffold) requires minSdk 23 */
|
||||
implementation 'androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-alpha18'
|
||||
implementation 'androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-beta01'
|
||||
implementation 'androidx.compose.material:material-icons-extended'
|
||||
implementation 'androidx.activity:activity-compose:1.11.0'
|
||||
|
||||
|
||||
Reference in new issue
Block a user