From 30292306bb3485dd5eda439f9da1d20c0d1eb4a7 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 21 Apr 2021 02:02:25 +0600
Subject: [PATCH] hotfix

---
 defaultAndroidSettings.gradle | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle
index 0153cd8dc0b..276131ff612 100644
--- a/defaultAndroidSettings.gradle
+++ b/defaultAndroidSettings.gradle
@@ -1,18 +1,27 @@
 apply plugin: 'com.getkeepsafe.dexcount'
 
 ext {
-    enableIncludingJvmCodeInAndroidPart = {
+    jvmKotlinFolderFile = {
         String sep = File.separator
-        File jvmKotlinFolder = new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
+        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 = {
-        String sep = File.separator
-        File jvmKotlinFolder = new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin")
-        android.sourceSets.main.java.srcDirs -= jvmKotlinFolder.path
+        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
+            }
+        }
     }
 }