workaround intellij's problem of shared src in multi platform context

robstoll · Dec 28, 2018 · 4e0abd0 · 4e0abd0
1 parent 53a3797
commit 4e0abd0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -303,8 +303,10 @@ Release & deploy a commit
     c) add new version to atrium-gh-pages/README.md
     d) commit & push changes
 4. deploy to bintray:
-    a) gr clean publishBintray
-    b) Log in to bintray, check and publish new jars
+    a) Temporary work around till https://youtrack.jetbrains.com/issue/KT-29069 is fixed:
+       export CI=true
+    b) gr clean publishBintray
+    c) Log in to bintray, check and publish new jars
 5. create release on github
     a) git tag vX.Y.Z
     b) git push origin vX.Y.Z

diff --git a/settings.gradle b/settings.gradle
@@ -15,50 +15,62 @@ apply plugin: 'ch.tutteli.settings'
 //noinspection GroovyAssignabilityCheck
 include {
 
+    //TODO remove as soon as https://youtrack.jetbrains.com/issue/KT-29069 is fixed
+    def kotlinJvmJsAndAndroidIfCi = { self, String suffix ->
+        if (System.getenv('CI')) {
+            self.kotlinJvmJsAndroid(suffix)
+        } else {
+            self.kotlinJvmJs(suffix)
+
+        }
+    }
+
     bundles {
-        kotlinJvmJsAndroid('cc-de_CH-robstoll')
-        kotlinJvmJsAndroid('cc-en_GB-robstoll')
-        kotlinJvmJsAndroid('cc-infix-en_GB-robstoll')
+
+
+        kotlinJvmJsAndAndroidIfCi(delegate, 'cc-de_CH-robstoll')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'cc-en_GB-robstoll')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'cc-infix-en_GB-robstoll')
 
         if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
             folder('cc-en_GB-robstoll') {
                 _ 'cc-en_GB-robstoll-smoke-test'
             }
-            folder('cc-infix-en_GB-robstoll'){
+            folder('cc-infix-en_GB-robstoll') {
                 _ 'cc-infix-en_GB-robstoll-smoke-test'
             }
         }
     }
 
     folder('apis', 'api-') {
-        kotlinJvmJsAndroid('cc-de_CH')
-        kotlinJvmJsAndroid('cc-en_GB')
-        kotlinJvmJsAndroid('cc-infix-en_GB')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'cc-de_CH')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'cc-en_GB')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'cc-infix-en_GB')
     }
 
     domain('domain-') {
-        kotlinJvmJsAndroid('api')
-        kotlinJvmJsAndroid('builders')
-        kotlinJvmJsAndroid('robstoll')
-        kotlinJvmJsAndroid('robstoll-lib')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'api')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'builders')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll-lib')
     }
 
     core('core-') {
-        kotlinJvmJsAndroid('api')
-        kotlinJvmJsAndroid('robstoll')
-        kotlinJvmJsAndroid('robstoll-lib')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'api')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'robstoll-lib')
     }
 
     translations('translations-') {
-        kotlinJvmJsAndroid('de_CH')
-        kotlinJvmJsAndroid('en_GB')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'de_CH')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'en_GB')
     }
 
     misc {
         _ 'bc-test'
         _ 'spec'
-        kotlinJvmJsAndroid('verbs')
-        kotlinJvmJsAndroid('verbs-internal')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'verbs')
+        kotlinJvmJsAndAndroidIfCi(delegate, 'verbs-internal')
     }
 
     //TODO remove all below with 1.0.0