From 1e68b2436f430ba0588a9bed7f875d4f0af7d5f1 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 12 Jan 2017 12:08:18 +0100
Subject: [PATCH] Relocate non-native/jni part of net.rubygrapefruit.platform
 in attempt to fix #KT-15570

---
 .../daemon/client/KotlinCompilerClient.kt     |  4 +--
 .../GradleKotlinCompilerRunner.kt             |  4 +--
 update_dependencies.xml                       | 25 ++++++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
index 8a6585ccb15..aabb4104012 100644
--- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.daemon.client
 
-import net.rubygrapefruit.platform.Native
-import net.rubygrapefruit.platform.ProcessLauncher
+import org.jetbrains.kotlin.net.rubygrapefruit.platform.Native
+import org.jetbrains.kotlin.net.rubygrapefruit.platform.ProcessLauncher
 import org.jetbrains.kotlin.daemon.common.*
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
index dcc1ba8f98d..4d79de9dc49 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.compilerRunner
 
-import net.rubygrapefruit.platform.Native
-import net.rubygrapefruit.platform.ProcessLauncher
+import org.jetbrains.kotlin.net.rubygrapefruit.platform.Native
+import org.jetbrains.kotlin.net.rubygrapefruit.platform.ProcessLauncher
 import org.gradle.api.Project
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 8a54c81332c..919eed4096e 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -42,7 +42,7 @@
 
     <property name="gradle.libs.repo" value="http://repo.gradle.org/gradle/libs-releases-local"/>
 
-    <property name="native-platform-lib-version" value="0.10"/>
+    <property name="native-platform-lib-version" value="0.11"/>
 
     <property file="${dependencies.info.file}" prefix="dependencies.info.prev"/>
 
@@ -130,7 +130,15 @@
         </sequential>
     </macrodef>
 
-    <target name="make-native-platform-uberjar">
+    <target name="fetch-jarjar" depends="make-dependency-dirs">
+        <antcall target="override-version"/>
+
+        <!-- JarJar -->
+        <get src="http://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jarjar/jarjar-1.4.jar" dest="${dependencies}/download/jarjar-1.4.jar" usetimestamp="true"/>
+        <copy file="${dependencies}/download/jarjar-1.4.jar" tofile="${dependencies}/jarjar.jar" overwrite="true"/>
+    </target>
+
+    <target name="make-native-platform-uberjar" depends="fetch-jarjar">
         <property name="dependencies" value="${dependencies}"/>
         <property name="download" value="${dependencies}/download"/>
         <property name="server" value="${gradle.libs.repo}"/>
@@ -158,7 +166,8 @@
         <get-lib suffix="-freebsd-amd64"/>
         <get-lib suffix="-freebsd-i386"/>
 
-        <jar destfile="${dependencies}/${common.name}-uberjar.jar">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${dependencies}/jarjar.jar"/>
+        <jarjar jarfile="${dependencies}/${common.name}-uberjar.jar">
             <zipfileset src="${download}/${common.name}.jar" includes="**" />
             <zipfileset src="${download}/${common.name}-windows-amd64.jar" includes="**" />
             <zipfileset src="${download}/${common.name}-windows-i386.jar" includes="**" />
@@ -168,20 +177,18 @@
             <zipfileset src="${download}/${common.name}-linux-i386.jar" includes="**" />
             <zipfileset src="${download}/${common.name}-freebsd-amd64.jar" includes="**" />
             <zipfileset src="${download}/${common.name}-freebsd-i386.jar" includes="**" />
-        </jar>
+            <rule pattern="net.rubygrapefruit.platform.*" result="org.jetbrains.kotlin.net.rubygrapefruit.platform.@1"/>
+            <rule pattern="net.rubygrapefruit.platform.internal.*" result="org.jetbrains.kotlin.net.rubygrapefruit.platform.internal.@1"/>
+        </jarjar>
     </target>
 
-    <target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests">
+    <target name="fetch-third-party" depends="make-dependency-dirs, fetch-jarjar, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests">
         <antcall target="override-version"/>
 
         <!-- ProGuard -->
         <get-maven-library prefix="net/sf/proguard" lib="proguard-base" version="5.3" target.jar.name.base="proguard" src="false"/>
         <get-maven-library prefix="net/sf/proguard" lib="proguard-anttask" version="5.3" target.jar.name.base="proguard-anttask" src="false"/>
 
-        <!-- JarJar -->
-        <get src="http://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jarjar/jarjar-1.4.jar" dest="${dependencies}/download/jarjar-1.4.jar" usetimestamp="true"/>
-        <copy file="${dependencies}/download/jarjar-1.4.jar" tofile="${dependencies}/jarjar.jar" overwrite="true"/>
-
         <!-- ant 1.8.2 -->
         <get-ant-library version="1.8.2" folderName="ant-1.8"/>