diff --git a/FloconAndroid/flocon-base/build.gradle.kts b/FloconAndroid/flocon-base/build.gradle.kts index 0cbd1bb7..4c63dfe7 100644 --- a/FloconAndroid/flocon-base/build.gradle.kts +++ b/FloconAndroid/flocon-base/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.android.library) @@ -5,7 +7,11 @@ plugins { } kotlin { - androidTarget() + androidTarget { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_11) + } + } jvm() @@ -62,6 +68,7 @@ android { ) } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 diff --git a/FloconAndroid/flocon/build.gradle.kts b/FloconAndroid/flocon/build.gradle.kts index bcabc819..337f2b1e 100644 --- a/FloconAndroid/flocon/build.gradle.kts +++ b/FloconAndroid/flocon/build.gradle.kts @@ -9,7 +9,11 @@ plugins { } kotlin { - androidTarget() + androidTarget { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_11) + } + } jvm() @@ -79,7 +83,6 @@ buildConfig { buildConfigField("APP_VERSION", System.getenv("PROJECT_VERSION_NAME") ?: project.property("floconVersion") as String) } - android { namespace = "io.github.openflocon.flocon" compileSdk = 36 diff --git a/FloconAndroid/gradle/libs.versions.toml b/FloconAndroid/gradle/libs.versions.toml index 6458cf27..2b6541ed 100644 --- a/FloconAndroid/gradle/libs.versions.toml +++ b/FloconAndroid/gradle/libs.versions.toml @@ -4,7 +4,7 @@ apollo = "4.0.0" coilCompose = "3.2.0" compose = "1.9.0" datastorePreferences = "1.1.7" -kotlin = "2.2.0" +kotlin = "2.1.0" mavenPublish = "0.34.0" coreKtx = "1.16.0" junit = "4.13.2" @@ -12,7 +12,7 @@ junitVersion = "1.2.1" espressoCore = "3.6.1" kotlinxCoroutinesBom = "1.10.2" kotlinxSerialization = "1.9.0" -ktor = "3.4.1" +ktor = "3.2.3" lifecycleRuntimeKtx = "2.9.1" activityCompose = "1.10.1" composeBom = "2025.06.01" @@ -26,7 +26,7 @@ grpc = "1.70.0" protobufPlugin = "0.9.5" grpcKotlin = "1.4.3" protobuf = "4.26.1" -ksp = "2.3.6" +ksp = "2.1.0-1.0.29" processPhoenix = "3.0.0" sqlite = "2.5.2" sqliteJdbc = "3.50.3.0" diff --git a/FloconAndroid/ktor-interceptor/build.gradle.kts b/FloconAndroid/ktor-interceptor/build.gradle.kts index 73f545ab..b7d332a7 100644 --- a/FloconAndroid/ktor-interceptor/build.gradle.kts +++ b/FloconAndroid/ktor-interceptor/build.gradle.kts @@ -7,7 +7,11 @@ plugins { } kotlin { - androidTarget() + androidTarget { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_11) + } + } jvm()