InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2025-11-03 21:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for repos in building

Browse Source
This commit is contained in:
InsanusMokrassar
2021-04-21 01:52:17 +06:00
parent 9e02c3e5ff
commit 2f9aa585f1
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
defaultAndroidSettings.gradle
View File

@@ -1,5 +1,21 @@
apply plugin: 'com.getkeepsafe.dexcount'
ext {
enableIncludingJvmCodeInAndroidPart = {
String sep = File.separator
File jvmKotlinFolder = new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
if (jvmKotlinFolder.exists()) {
android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path
}
}
disableIncludingJvmCodeInAndroidPart = {
String sep = File.separator
File jvmKotlinFolder = new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
android.sourceSets.main.java.srcDirs -= jvmKotlinFolder.path
}
}
android {
compileSdkVersion "$android_compileSdkVersion".toInteger()
buildToolsVersion "$android_buildToolsVersion"
@@ -37,9 +53,6 @@ android {
sourceSets {
String sep = File.separator
main.java.srcDirs += "src${sep}main${sep}kotlin"
File jvmKotlinFolder = new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
if (jvmKotlinFolder.exists()) {
main.java.srcDirs += jvmKotlinFolder.path
}
enableIncludingJvmCodeInAndroidPart()
}
}

2
repos/common/build.gradle
View File

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