From bd2e00ae99bccba1b1a6f00bbcceb8c9227f1069 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 31 Jan 2019 07:19:27 +0300
Subject: [PATCH] Exclude kotlin.native internal package from modular
 kotlin-stdlib

Otherwise jlink fails to consume this library due to Java keyword in
package name.

#KT-29612
---
 libraries/stdlib/jvm/build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 03964e0bfd0..7ff100533a3 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -127,7 +127,10 @@ task modularJar(type: Jar) {
     manifestAttributes(manifest, project, 'Main', true)
     classifier = 'modular'
 
-    from zipTree(jar.outputs.files.singleFile)
+    from zipTree(jar.outputs.files.singleFile).matching {
+        // Beware of Gradle problem: changing exclude spec doesn't affect Jar task up-to-dateness
+        exclude('kotlin/native/**')
+    }
     from sourceSets.java9.output
 }