android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-29 04:39:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

android, desktop: fix build error related to JVM version (#3995)

Browse source
This commit is contained in:
Stanislav Dmitrenko 2024-04-05 21:29:41 +07:00 • committed by GitHub
parent a725d2efac
commit 6133993cfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/multiplatform/android/build.gradle.kts
View file

@ -48,12 +48,7 @@ android {
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
} }
} }
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions { kotlinOptions {
jvmTarget = "11"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi"
freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi" freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi" freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi"

24
apps/multiplatform/build.gradle.kts
View file

@ -83,6 +83,30 @@ plugins {
id("org.jetbrains.kotlin.plugin.serialization") apply false id("org.jetbrains.kotlin.plugin.serialization") apply false
} }
// https://raymondctc.medium.com/configuring-your-sourcecompatibility-targetcompatibility-and-kotlinoptions-jvmtarget-all-at-once-66bf2198145f
val jvmVersion: Provider<String> = providers.gradleProperty("kotlin.jvm.target")
configure(subprojects) {
// Apply compileOptions to subprojects
plugins.withType<com.android.build.gradle.BasePlugin>().configureEach {
extensions.findByType<com.android.build.gradle.BaseExtension>()?.apply {
jvmVersion.map { JavaVersion.toVersion(it) }.orNull?.let {
compileOptions {
sourceCompatibility = it
targetCompatibility = it
}
}
}
}
// Apply kotlinOptions.jvmTarget to subprojects
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
if (jvmVersion.isPresent) jvmTarget = jvmVersion.get()
}
}
}
tasks.register("clean", Delete::class) { tasks.register("clean", Delete::class) {
delete(rootProject.buildDir) delete(rootProject.buildDir)
} }

4
apps/multiplatform/common/build.gradle.kts
View file

@ -117,10 +117,6 @@ android {
} }
testOptions.targetSdk = 33 testOptions.targetSdk = 33
lint.targetSdk = 33 lint.targetSdk = 33
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
val isAndroid = gradle.startParameter.taskNames.find { val isAndroid = gradle.startParameter.taskNames.find {
val lower = it.lowercase() val lower = it.lowercase()
lower.contains("release") || lower.startsWith("assemble") || lower.startsWith("install") lower.contains("release") || lower.startsWith("assemble") || lower.startsWith("install")

1
apps/multiplatform/gradle.properties
View file

@ -24,6 +24,7 @@ android.nonTransitiveRClass=true
# Automatically convert third-party libraries to use AndroidX # Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true android.enableJetifier=true
kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.jvm.target=11
android.version_name=5.6.1 android.version_name=5.6.1
android.version_code=193 android.version_code=193