From 750b62b112c1a7d336bf79012924ca1b0122751a Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 26 Nov 2019 16:31:11 +0700
Subject: [PATCH] Update Gradle: 6.0.1

---
 .../groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy    | 3 ++-
 build.gradle                                                  | 2 +-
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 gradlew                                                       | 4 ++--
 .../gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 samples/androidNativeActivity/gradlew                         | 4 ++--
 samples/calculator/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 samples/calculator/gradlew                                    | 4 ++--
 .../kotlin-library/gradle/wrapper/gradle-wrapper.properties   | 2 +-
 samples/cocoapods/kotlin-library/gradlew                      | 4 ++--
 samples/gradle/wrapper/gradle-wrapper.properties              | 2 +-
 samples/gradlew                                               | 4 ++--
 tools/kotlin-native-gradle-plugin/build.gradle                | 2 +-
 13 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
index 35913945e8e..56f7e9f84a7 100644
--- a/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
+++ b/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
@@ -23,6 +23,7 @@ import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.AbstractNamedDomainObjectContainer
+import org.gradle.api.internal.CollectionCallbackActionDecorator
 import org.gradle.api.internal.file.AbstractFileCollection
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
@@ -266,7 +267,7 @@ class NativeInteropExtension extends AbstractNamedDomainObjectContainer<NamedNat
     private String flavor = 'jvm'
 
     protected NativeInteropExtension(Project project) {
-        super(NamedNativeInteropConfig, project.gradle.services.get(Instantiator))
+        super(NamedNativeInteropConfig, project.gradle.services.get(Instantiator), project.gradle.services.get(CollectionCallbackActionDecorator))
         this.project = project
     }
 
diff --git a/build.gradle b/build.gradle
index 0ac6a00622b..12c570fa54f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -203,7 +203,7 @@ dependencies {
 }
 
 task sharedJar {
-    dependsOn gradle.includedBuild('kotlin-native-shared').task(':jar')
+    dependsOn gradle.includedBuild('shared').task(':jar')
 }
 
 task gradlePluginJar {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ca9d62814a2..1ba7206f882 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 8e25e6c19d5..83f2acfdc31 100755
--- a/gradlew
+++ b/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties b/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties
index 7c4388a9216..94920145f34 100644
--- a/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/androidNativeActivity/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/androidNativeActivity/gradlew b/samples/androidNativeActivity/gradlew
index 8e25e6c19d5..83f2acfdc31 100755
--- a/samples/androidNativeActivity/gradlew
+++ b/samples/androidNativeActivity/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/samples/calculator/gradle/wrapper/gradle-wrapper.properties b/samples/calculator/gradle/wrapper/gradle-wrapper.properties
index 7c4388a9216..94920145f34 100644
--- a/samples/calculator/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/calculator/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/calculator/gradlew b/samples/calculator/gradlew
index 8e25e6c19d5..83f2acfdc31 100755
--- a/samples/calculator/gradlew
+++ b/samples/calculator/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties b/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties
index 7c4388a9216..94920145f34 100644
--- a/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/cocoapods/kotlin-library/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/cocoapods/kotlin-library/gradlew b/samples/cocoapods/kotlin-library/gradlew
index 8e25e6c19d5..83f2acfdc31 100755
--- a/samples/cocoapods/kotlin-library/gradlew
+++ b/samples/cocoapods/kotlin-library/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/samples/gradle/wrapper/gradle-wrapper.properties b/samples/gradle/wrapper/gradle-wrapper.properties
index 7c4388a9216..94920145f34 100644
--- a/samples/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/gradlew b/samples/gradlew
index 8e25e6c19d5..83f2acfdc31 100755
--- a/samples/gradlew
+++ b/samples/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 2f69c9f4424..37b0eb8620e 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -172,7 +172,7 @@ processResources {
     from(file("$rootBuildDirectory/utilities/env_blacklist"))
 }
 
-compileTestGroovy.dependsOn.remove('compileTestJava')
+compileTestGroovy.dependsOn -= 'compileTestJava'
 compileTestKotlin.dependsOn compileTestGroovy
 compileTestKotlin.classpath += files(compileTestGroovy.destinationDir)