From dd3cf531cf041d134e785357bd0b14bb1a9ffda7 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 4 Apr 2018 21:23:00 +0200
Subject: [PATCH] Disable packing module-info to libraries until Android issue
 is fixed

https://issuetracker.google.com/issues/77587908

 #KT-21266 Open
---
 libraries/commonConfiguration.gradle   | 3 +++
 libraries/kotlin.test/jvm/build.gradle | 3 ++-
 libraries/reflect/api/build.gradle     | 3 ++-
 libraries/stdlib/build.gradle          | 6 ++++--
 libraries/stdlib/jdk7/build.gradle     | 3 ++-
 libraries/stdlib/jdk8/build.gradle     | 3 ++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 9e1fae61abd..2174b8b38fd 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -89,10 +89,13 @@ ext.manifestAttributes = { Manifest manifest, Project project, String component
                 'Kotlin-Runtime-Component': component,
                 'Kotlin-Version': project.kotlinLanguageVersion
         }
+        // TODO: enable as soon as this doesn't cause D8/DX to crash
+        /*
         if (multiRelease) {
             attributes \
                 'Multi-Release': 'true'
         }
+        */
     }
 }
 
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 191b317101a..885a45628a1 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -23,7 +23,8 @@ archivesBaseName = 'kotlin-test'
 
 jar {
     manifestAttributes(manifest, project, 'Test', true)
-    from sourceSets.java9.output
+    // TODO: enable as soon as this doesn't cause D8/DX to crash
+    // from sourceSets.java9.output
 }
 
 artifacts {
diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle
index ee3dac3c12e..45a5636aa83 100644
--- a/libraries/reflect/api/build.gradle
+++ b/libraries/reflect/api/build.gradle
@@ -40,7 +40,8 @@ jar {
 
 task java9Jar(type: Jar) {
     classifier = "java9"
-    from sourceSets.java9.output
+    // TODO: enable as soon as this doesn't cause D8/DX to crash
+    // from sourceSets.java9.output
 }
 
 artifacts {
diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle
index abc9c75a57e..a9f7ee25f73 100644
--- a/libraries/stdlib/build.gradle
+++ b/libraries/stdlib/build.gradle
@@ -71,7 +71,8 @@ jar {
     from("${rootDir}/dist/builtins")
     from sourceSets.builtins.output
     from sourceSets.experimental.output
-    from sourceSets.java9.output
+    // TODO: enable as soon as this doesn't cause D8/DX to crash
+    // from sourceSets.java9.output
 }
 
 task distJar(type: Jar) {
@@ -83,7 +84,8 @@ task distJar(type: Jar) {
     from sourceSets.builtins.output
     from sourceSets.main.output
     from sourceSets.experimental.output
-    from sourceSets.java9.output
+    // TODO: enable as soon as this doesn't cause D8/DX to crash
+    // from sourceSets.java9.output
 }
 
 task builtinsJar(type: Jar) {
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 836273a16ab..70cb93eaaa1 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -35,7 +35,8 @@ sourceSets {
 
 jar {
     manifestAttributes(manifest, project, 'Main', true)
-    from sourceSets.java9.output
+    // TODO: enable as soon as this doesn't cause D8/DX to crash
+    // from sourceSets.java9.output
 }
 
 artifacts {
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index f044bdbffc9..a202598b0ca 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -38,7 +38,8 @@ sourceSets {
 
 jar {
     manifestAttributes(manifest, project, 'Main', true)
-    from sourceSets.java9.output
+    // TODO: enable as soon as this doesn't cause D8/DX to crash
+    // from sourceSets.java9.output
 }
 
 artifacts {