Cleanup gradle logging and build fixes

This commit is contained in:
Syer10
2022-09-22 22:31:19 -04:00
parent 7a7e92a7b4
commit 916a6a5a80
3 changed files with 30 additions and 1 deletions

View File

@@ -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",
))
}
}

View File

@@ -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<ComposePlugin> {
ext["compose.compiler.version"] = libs.versions.composeCompiler.get()
}
afterEvaluate {
extensions.findByType<KotlinMultiplatformExtension>()?.let { ext ->
ext.sourceSets.removeAll { sourceSet ->
setOf(
"androidAndroidTestRelease",
"androidTestFixtures",
"androidTestFixturesDebug",
"androidTestFixturesRelease",
).contains(sourceSet.name)
}
}
}
}
fun isNonStable(version: String): Boolean {

View File

@@ -3,3 +3,4 @@ org.gradle.jvmargs=-Xmx2048m
android.enableJetifier=false
android.useAndroidX=true
kotlin.mpp.stability.nowarn=true
kotlin.native.ignoreDisabledTargets=true