diff -r 5986ef49853d -r ab226603d0f5 sample/build.gradle.kts --- a/sample/build.gradle.kts Mon May 04 16:21:57 2026 -0400 +++ b/sample/build.gradle.kts Mon May 04 18:00:16 2026 -0400 @@ -23,24 +23,20 @@ @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("com.android.application") - kotlin("multiplatform") + id("com.geekorum.build.conventions.mpp-library-with-android") id("com.geekorum.build.source-license-checker") alias(libs.plugins.kotlin.compose) alias(libs.plugins.jetbrains.compose.multiplatform) alias(libs.plugins.kotlinx.serialization) - alias(libs.plugins.google.gms.oss.license) } -// workaround bug https://issuetracker.google.com/issues/275534543 -buildscript { - dependencies { - classpath("com.android.tools.build:gradle:8.13.0") - } -} kotlin { - androidTarget { + android { + namespace = "com.geekorum.aboutoss.sampleapp" + androidResources { + enable = true + } compilerOptions { jvmTarget.set(JvmTarget.JVM_17) } @@ -65,10 +61,10 @@ sourceSets { commonMain.dependencies { - implementation(project(":core")) - implementation(project(":ui:common")) - implementation(project(":ui:material2")) - implementation(project(":ui:material3")) + api(project(":core")) + api(project(":ui:common")) + api(project(":ui:material2")) + api(project(":ui:material3")) implementation(compose.material3) implementation(compose.components.resources) implementation(compose.components.uiToolingPreview) @@ -91,54 +87,3 @@ } } -android { - namespace = "com.geekorum.aboutoss.sampleapp" - compileSdk = 36 - - defaultConfig { - applicationId = "com.geekorum.aboutoss.sampleapp" - minSdk = 28 - targetSdk = 35 - versionCode = 1 - versionName = "1.0" - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables { - useSupportLibrary = true - } - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - - buildFeatures { - compose = true - buildConfig = true - } - packaging { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - } - } -} - -dependencies { - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.test.ext.junit) - androidTestImplementation(libs.espresso.core) - androidTestImplementation(platform(libs.androidx.compose.bom)) - androidTestImplementation(libs.androidx.compose.uiTestJunit4) - debugImplementation(libs.androidx.compose.uiTooling) - debugImplementation(libs.androidx.compose.uiTestManifest) -}