diff -r ff77c11da594 -r 764faee147cc ui/material2/build.gradle.kts --- a/ui/material2/build.gradle.kts Tue Apr 22 17:48:27 2025 -0400 +++ b/ui/material2/build.gradle.kts Tue Apr 22 17:56:14 2025 -0400 @@ -19,10 +19,13 @@ * You should have received a copy of the GNU General Public License * along with AboutOss. If not, see . */ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.library") - kotlin("android") + kotlin("multiplatform") alias(libs.plugins.org.jetbrains.kotlin.compose.compiler) + alias(libs.plugins.org.jetbrains.compose.multiplatform) id("com.geekorum.build.source-license-checker") `maven-publish` } @@ -30,6 +33,41 @@ group = "com.geekorum.aboutoss" version = "0.1.0" +kotlin { + androidTarget { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } + } + + jvm("desktop") + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64(), + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "aboutoss-core" + isStatic = true + } + } + + sourceSets { + commonMain.dependencies { + api(project(":ui:common")) + implementation(project(":core")) + implementation(compose.material) + implementation(compose.components.resources) + } + + androidMain.dependencies { + api(libs.androidx.activity) + } + } +} + + android { namespace = "com.geekorum.aboutoss.ui.material" compileSdk = 35 @@ -55,11 +93,8 @@ } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } buildFeatures { @@ -75,10 +110,7 @@ } dependencies { - api(project(":ui:common")) implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.compose.material) - implementation(libs.androidx.compose.material.icons.core) implementation(libs.androidx.activity.compose) implementation(libs.androidx.navigation.compose)