diff --git a/android/build.gradle.kts b/android/build.gradle.kts index db617811..7ba2d16c 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -111,4 +111,19 @@ android { setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")) } } + + packagingOptions { + resources.excludes.addAll(listOf( + "META-INF/DEPENDENCIES", + "LICENSE.txt", + "META-INF/LICENSE", + "META-INF/LICENSE.txt", + "META-INF/LICENSE.md", + "META-INF/LICENSE-notice.md", + "META-INF/README.md", + "META-INF/NOTICE", + "META-INF/*.kotlin_module", + "META-INF/*.version", + )) + } } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index bc848f4e..1f236b67 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ import Config.serverCode import Config.tachideskVersion import com.codingfeline.buildkonfig.compiler.FieldSpec.Type import org.jetbrains.compose.ComposePlugin +import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile @Suppress("DSL_SCOPE_VIOLATION") @@ -149,6 +150,18 @@ subprojects { plugins.withType { ext["compose.compiler.version"] = libs.versions.composeCompiler.get() } + afterEvaluate { + extensions.findByType()?.let { ext -> + ext.sourceSets.removeAll { sourceSet -> + setOf( + "androidAndroidTestRelease", + "androidTestFixtures", + "androidTestFixturesDebug", + "androidTestFixturesRelease", + ).contains(sourceSet.name) + } + } + } } fun isNonStable(version: String): Boolean { diff --git a/gradle.properties b/gradle.properties index aa6e2a3a..e0cbaced 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,5 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx2048m android.enableJetifier=false android.useAndroidX=true -kotlin.mpp.stability.nowarn=true \ No newline at end of file +kotlin.mpp.stability.nowarn=true +kotlin.native.ignoreDisabledTargets=true \ No newline at end of file