InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2026-09-07 00:39:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrate onto new android dsl

Browse Source
This commit is contained in:
InsanusMokrassar
2026-08-28 23:04:25 +06:00
parent 9381e7d057
commit 6c843c4dd4
53 changed files with 101 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/templates/addComposeForAndroid.gradle
View File

@@ -1,6 +1,6 @@
kotlin {
sourceSets {
androidUnitTest {
androidHostTest {
dependencies {
implementation compose.uiTest
}

42
gradle/templates/defaultAndroidSettings.gradle
View File

@@ -1,34 +1,18 @@
apply plugin: 'com.getkeepsafe.dexcount'
android {
compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
buildToolsVersion libs.versions.android.props.buildTools.get()
defaultConfig {
minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
versionCode "${android_code_version}".toInteger()
versionName "$version"
namespace "${project.group}.${project.name}"
}
buildTypes {
release {
minifyEnabled false
}
debug {
debuggable true
ext.configureAndroidTarget = { target ->
target.compileSdk = libs.versions.android.props.compileSdk.get().toInteger()
target.buildToolsVersion = libs.versions.android.props.buildTools.get()
target.minSdk = libs.versions.android.props.minSdk.get().toInteger()
target.namespace = "${project.group}.${project.name}"
target.packaging {
resources {
excludes.add 'META-INF/kotlinx-serialization-runtime.kotlin_module'
excludes.add 'META-INF/kotlinx-serialization-cbor.kotlin_module'
excludes.add 'META-INF/kotlinx-serialization-properties.kotlin_module'
}
}
packagingOptions {
exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
target.compilerOptions.jvmTarget.set(
target.compilerOptions.jvmTarget.get().class.fromTarget("17")
)
}

34
gradle/templates/enableMPPAndroid.gradle
View File

@@ -1,25 +1,31 @@
apply from: "$defaultAndroidSettings"
kotlin {
androidTarget {
publishLibraryVariants(
"release",
"debug",
)
compilations.all {
kotlinOptions {
jvmTarget = "17"
}
}
android {
project.ext.configureAndroidTarget(delegate)
withHostTest {}
withDeviceTest {}
}
sourceSets {
androidUnitTest {
jvmAndAndroidMain {
dependsOn commonMain
kotlin.srcDir("src/jvmMain/kotlin")
resources.srcDir("src/jvmMain/resources")
}
jvmMain {
dependsOn jvmAndAndroidMain
kotlin.setSrcDirs([])
resources.setSrcDirs([])
}
androidHostTest {
dependencies {
implementation kotlin('test-junit')
implementation libs.android.test.junit
implementation libs.android.espresso
}
}
androidInstrumentedTest {
androidDeviceTest {
dependencies {
implementation kotlin('test-junit')
implementation libs.android.test.junit
@@ -27,8 +33,6 @@ kotlin {
}
}
androidMain.dependsOn jvmMain
androidMain.dependsOn jvmAndAndroidMain
}
}
apply from: "$defaultAndroidSettings"