Fixed "kotlinSnapshot" build mode

elizarov · elizarov · commit 8fca5d3d071f · 2018-01-17T10:21:43.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ allprojects {
 }
 
 buildscript {
-    if (System.properties['kotlinSnapshot'] != null) {
+    if (rootProject.properties['kotlinSnapshot'] != null) {
         ext.kotlin_version = '1.2-SNAPSHOT'
         repositories {
             maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
diff --git a/js/example-frontend-js/build.gradle b/js/example-frontend-js/build.gradle
@@ -44,5 +44,7 @@ task start(type: NpmTask, dependsOn: bundle) {
 // we have not tests but kotlin-dce-js still tries to work with them and crashed.
 // todo: Remove when KT-22028 is fixed
 afterEvaluate {
-    tasks.unpackDependenciesTestKotlinJs.enabled = false
+    if (tasks.findByName('unpackDependenciesTestKotlinJs')) {
+        tasks.unpackDependenciesTestKotlinJs.enabled = false
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ allprojects {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`buildscript {`
`8`		`- if (System.properties['kotlinSnapshot'] != null) {`
	`8`	`+ if (rootProject.properties['kotlinSnapshot'] != null) {`
`9`	`9`	`ext.kotlin_version = '1.2-SNAPSHOT'`
`10`	`10`	`repositories {`
`11`	`11`	`maven { url "https://oss.sonatype.org/content/repositories/snapshots" }`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,7 @@ task start(type: NpmTask, dependsOn: bundle) {`
`44`	`44`	`// we have not tests but kotlin-dce-js still tries to work with them and crashed.`
`45`	`45`	`// todo: Remove when KT-22028 is fixed`
`46`	`46`	`afterEvaluate {`
`47`		`- tasks.unpackDependenciesTestKotlinJs.enabled = false`
	`47`	`+ if (tasks.findByName('unpackDependenciesTestKotlinJs')) {`
	`48`	`+ tasks.unpackDependenciesTestKotlinJs.enabled = false`
	`49`	`+ }`
`48`	`50`	`}`