From 63cfb0e0ce8f868eea4266d59c8143a4e59884b3 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 26 Jul 2021 11:56:51 +0200
Subject: [PATCH] remove implementation detail libraries "ion" and "slf4j" from
 OpenAPI module tooling-extension-api dependencies to avoid leaking into api

GitOrigin-RevId: 4d10affb14af86283ab8cb60c27ac54f04cf9614
---
 .../intellij.gradle.toolingExtension.iml                      | 2 --
 .../plugins/gradle/tooling/serialization/annotations.xml      | 0
 .../intellij.gradle.toolingExtension.impl.iml                 | 4 ++++
 .../gradle/tooling/serialization/ToolingStreamApiUtils.java   | 2 +-
 .../internal/IdeaProjectSerializationService.java             | 0
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename plugins/gradle/{tooling-extension-api => tooling-extension-impl}/anno/org/jetbrains/plugins/gradle/tooling/serialization/annotations.xml (100%)
 rename plugins/gradle/{tooling-extension-api => tooling-extension-impl}/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java (97%)
 rename plugins/gradle/{tooling-extension-api => tooling-extension-impl}/src/org/jetbrains/plugins/gradle/tooling/serialization/internal/IdeaProjectSerializationService.java (100%)

diff --git a/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml b/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
index 403f0ac75272..db8511fd0c97 100644
--- a/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
+++ b/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml
@@ -12,10 +12,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
     <orderEntry type="library" name="Trove4j" level="project" />
-    <orderEntry type="library" name="ion" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" />
     <orderEntry type="library" name="jetbrains-annotations-java5" level="project" />
-    <orderEntry type="library" exported="" name="Slf4j" level="project" />
     <orderEntry type="library" exported="" name="Gradle" level="project" />
     <orderEntry type="module-library" exported="" scope="PROVIDED">
       <library name="org.codehaus.groovy:groovy:2.4.17 - Gradle Tooling" type="repository">
diff --git a/plugins/gradle/tooling-extension-api/anno/org/jetbrains/plugins/gradle/tooling/serialization/annotations.xml b/plugins/gradle/tooling-extension-impl/anno/org/jetbrains/plugins/gradle/tooling/serialization/annotations.xml
similarity index 100%
rename from plugins/gradle/tooling-extension-api/anno/org/jetbrains/plugins/gradle/tooling/serialization/annotations.xml
rename to plugins/gradle/tooling-extension-impl/anno/org/jetbrains/plugins/gradle/tooling/serialization/annotations.xml
diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
index 388f384d6f27..38fd78e17fbf 100644
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
@@ -2,6 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
+    <annotation-paths>
+      <root url="file://$MODULE_DIR$/anno" />
+    </annotation-paths>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
@@ -16,5 +19,6 @@
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="library" name="ion" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" />
+    <orderEntry type="library" exported="" name="Slf4j" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java
similarity index 97%
rename from plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java
rename to plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java
index 88fa3876fe1e..f7f6a5f8b779 100644
--- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/ToolingStreamApiUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.gradle.tooling.serialization;
 
 import com.amazon.ion.IonReader;
diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/serialization/internal/IdeaProjectSerializationService.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/internal/IdeaProjectSerializationService.java
similarity index 100%
rename from plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/serialization/internal/IdeaProjectSerializationService.java
rename to plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/internal/IdeaProjectSerializationService.java