meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(build): Centralize Android SDK and Java versions (#4377)

Browse source
This commit is contained in:
James Rich 2026-01-30 11:36:36 -06:00 • committed by GitHub
parent b95c773ec7
commit cbf70fcc3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/KotlinAndroid.kt
View file

@ -20,6 +20,8 @@ package org.meshtastic.buildlogic
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.CommonExtension
import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
import com.android.build.api.dsl.LibraryExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.findByType
@ -37,16 +39,25 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
internal fun Project.configureKotlinAndroid(
commonExtension: CommonExtension,
) {
val compileSdkVersion = configProperties.getProperty("COMPILE_SDK").toInt()
val minSdkVersion = configProperties.getProperty("MIN_SDK").toInt()
val targetSdkVersion = configProperties.getProperty("TARGET_SDK").toInt()
commonExtension.apply {
compileSdk = configProperties.getProperty("COMPILE_SDK").toInt()
defaultConfig.apply {
minSdk = configProperties.getProperty("MIN_SDK").toInt()
if (commonExtension is ApplicationExtension) {
commonExtension.defaultConfig.targetSdk = configProperties.getProperty("TARGET_SDK").toInt()
when (this) {
is ApplicationExtension -> {
compileSdk = compileSdkVersion
defaultConfig.targetSdk = targetSdkVersion
}
is LibraryExtension -> {
compileSdk = compileSdkVersion
}
}
defaultConfig.minSdk = minSdkVersion
compileOptions.sourceCompatibility = JavaVersion.VERSION_17
compileOptions.targetCompatibility = JavaVersion.VERSION_17
}
configureKotlin<KotlinAndroidProjectExtension>()