build: Use Gradle 4.2

backend.native/build.gradle

@@ -211,11 +211,10 @@ task run {
 }
 
 jar {
-    from 'build/classes/cli_bc', 
+    from sourceSets.cli_bc.output,
-         'build/classes/compiler', 
+         sourceSets.compiler.output,
-         'build/classes/hashInteropStubs', 
+         sourceSets.hashInteropStubs.output,
-         'build/classes/llvmInteropStubs',
+         sourceSets.llvmInteropStubs.output
-         'build/resources/compiler'
 
     dependsOn ':runtime:hostRuntime', 'external_jars'
 }

build.gradle

@@ -273,6 +273,7 @@ targetList.each { target ->
             if (new PlatformInfo().isWindows())
                 suffix = 'bat'
             task(taskName, type:GradleBuild) {
+                dependsOn ':dist'
                 dependsOn ':tools:kotlin-native-gradle-plugin:jar'
                 dependsOn defFile.config.depends.collect{defFileToTaskName(target, it)}
                 tasks = ['clean', 'klibInstall']

buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy

@@ -19,7 +19,6 @@ package org.jetbrains.kotlin
 import groovy.json.JsonOutput
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.JavaExec
-import org.gradle.api.tasks.ParallelizableTask
 import org.gradle.api.tasks.TaskAction
 import org.gradle.process.ExecResult
 import org.jetbrains.kotlin.konan.target.*
@@ -79,13 +78,6 @@ abstract class KonanTest extends JavaExec {
         dependsOn(project.rootProject.tasks['dist'])
     }
 
-    @Override
-    void setJvmArgs(Iterable<?> arguments) {
-        super.setJvmArgs(arguments +
-                "-Dkonan.home=${dist.canonicalPath}" +
-                "-Djava.library.path=${dist.canonicalPath}/konan/nativelib")
-    }
-
     @Override
     void exec() {
         // Perhaps later we will return this exec() back but for now rest of infrastructure expects
@@ -100,6 +92,8 @@ abstract class KonanTest extends JavaExec {
         try {
             main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt'
             classpath = project.configurations.cli_bc
+            jvmArgs "-Dkonan.home=${dist.canonicalPath}",
+                    "-Djava.library.path=${dist.canonicalPath}/konan/nativelib"
             enableAssertions = true
             args = ["-output", output,
                     *filesToCompile,
@@ -301,7 +295,6 @@ class TestFailedException extends RuntimeException {
         super(s)
     }
 }
-@ParallelizableTask
 class RunKonanTest extends KonanTest {
     void compileTest(List<String> filesToCompile, String exe) {
         runCompiler(filesToCompile, exe, flags?:[])
@@ -312,7 +305,6 @@ class RunKonanTest extends KonanTest {
 // Don't use this task for regular testing as
 // project.exec + a shell script isolate the jvm
 // from IDEA. Use the RunKonanTest instead.
-@ParallelizableTask
 class RunDriverKonanTest extends KonanTest {
 
     RunDriverKonanTest() {
@@ -347,7 +339,6 @@ class RunDriverKonanTest extends KonanTest {
     }
 }
 
-@ParallelizableTask
 class RunInteropKonanTest extends KonanTest {
 
     private String interop
@@ -375,7 +366,6 @@ class RunInteropKonanTest extends KonanTest {
     }
 }
 
-@ParallelizableTask
 class LinkKonanTest extends KonanTest {
     protected String lib
 
@@ -388,7 +378,6 @@ class LinkKonanTest extends KonanTest {
     }
 }
 
-@ParallelizableTask
 class RunExternalTestGroup extends RunKonanTest {
 
     def groupDirectory = "."

gradle/wrapper/gradle-wrapper.properties

@@ -1,22 +1,5 @@
-#
-# Copyright 2010-2017 JetBrains s.r.o.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#Thu Oct 27 13:47:42 MSK 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Escape application args
-function splitJvmOpts() {
+save () {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

samples/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Mar 31 14:34:32 NOVT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

samples/gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }