Improvements

try to make it run on Android (still unsuccessful)
This commit is contained in:
2024-08-21 00:37:29 +02:00
parent 9175e54c69
commit 082899152f
34 changed files with 84 additions and 20 deletions

View File

@@ -1,12 +1,41 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.compose)
}
kotlin {
jvmToolchain(11)
jvm {
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}
androidTarget {
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}
android.apply {
compileSdk = libs.versions.android.compileSdk.get().toInt()
namespace = "ch.dissem.yaep.common.ui"
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
}
sourceSets {
commonMain {
dependencies {
api(projects.domain)
@@ -15,12 +44,16 @@ kotlin {
implementation(compose.foundation)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.components.uiToolingPreview)
// implementation(libs.compose.ui.text.googlefonts)
testImplementation(libs.kotlin.test)
testImplementation(libs.atrium)
}
}
val commonTest by getting {
dependencies {
implementation(libs.kotlin.test)
implementation(libs.atrium)
}
}
}
}

View File

@@ -1,12 +1,43 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.android.library)
}
kotlin {
jvmToolchain(11)
jvm{
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}
androidTarget{
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}
}
android.apply {
compileSdk = libs.versions.android.compileSdk.get().toInt()
namespace = "ch.dissem.yaep.domain"
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
sourceSets {
val commonTest by getting {
dependencies {
testImplementation(libs.kotlin.test)
testImplementation(libs.atrium)
implementation(libs.kotlin.test)
implementation(libs.atrium)
}
}
}
}

View File

@@ -1,5 +1,5 @@
[versions]
agp = "8.5.1"
agp = "8.5.2"
android-compileSdk = "34"
android-minSdk = "24"
android-targetSdk = "34"