InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-11-17 13:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup in build scripts

Browse Source
This commit is contained in:
InsanusMokrassar 2023-02-27 17:03:09 +06:00
parent d8cf3c6726
commit 73c724a2e5
5 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/build.gradle
View File

@ -18,6 +18,7 @@ kotlin {
api project(":micro_utils.coroutines") api project(":micro_utils.coroutines")
api libs.android.fragment api libs.android.fragment
} }
dependsOn jvmMain
} }
} }
} }

35
defaultAndroidSettings.gradle
View File

@ -1,30 +1,5 @@
apply plugin: 'com.getkeepsafe.dexcount' apply plugin: 'com.getkeepsafe.dexcount'
ext {
jvmKotlinFolderFile = {
String sep = File.separator
return new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
}
enableIncludingJvmCodeInAndroidPart = {
File jvmKotlinFolder = jvmKotlinFolderFile()
if (jvmKotlinFolder.exists()) {
android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path
}
}
disableIncludingJvmCodeInAndroidPart = {
File jvmKotlinFolder = jvmKotlinFolderFile()
String[] oldDirs = android.sourceSets.main.java.srcDirs
android.sourceSets.main.java.srcDirs = []
for (oldDir in oldDirs) {
if (oldDir != jvmKotlinFolder.path) {
android.sourceSets.main.java.srcDirs += oldDir
}
}
}
}
android { android {
compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
buildToolsVersion libs.versions.android.props.buildTools.get() buildToolsVersion libs.versions.android.props.buildTools.get()
@ -59,9 +34,9 @@ android {
jvmTarget = JavaVersion.VERSION_1_8.toString() jvmTarget = JavaVersion.VERSION_1_8.toString()
} }
sourceSets { // sourceSets {
String sep = File.separator // String sep = File.separator
main.java.srcDirs += "src${sep}main${sep}kotlin" // main.java.srcDirs += "src${sep}main${sep}kotlin"
enableIncludingJvmCodeInAndroidPart() //// enableIncludingJvmCodeInAndroidPart()
} // }
} }

3
ktor/client/build.gradle
View File

@ -15,5 +15,8 @@ kotlin {
api libs.ktor.client api libs.ktor.client
} }
} }
androidMain {
dependsOn jvmMain
}
} }
} }

3
ktor/common/build.gradle
View File

@ -17,5 +17,8 @@ kotlin {
api libs.ktor.io api libs.ktor.io
} }
} }
androidMain {
dependsOn jvmMain
}
} }
} }

2
repos/common/build.gradle
View File

@ -32,5 +32,3 @@ kotlin {
} }
} }
} }
disableIncludingJvmCodeInAndroidPart()