Rename JPMS module for multiplatform annotations to "multiplatform_an…

…notations"

java-annotations/build.gradle

@@ -19,7 +19,7 @@ project.archivesBaseName = 'annotations'
 
 task mainJar(type: Jar) {
     into ("META-INF/versions/9", {
-        from (project(':module-info').sourceSets.main.output, {
+        from (project(':java-module-info').sourceSets.main.output, {
             // Skip extra files from common sources compiled with Java 9 target
             include("module-info.class")
         })
@@ -31,7 +31,7 @@ task mainJar(type: Jar) {
 
 task sourceJar(type: Jar) {
     into ("META-INF/versions/9", {
-        from project(':module-info').sourceSets.main.java
+        from project(':java-module-info').sourceSets.main.java
     })
     duplicatesStrategy = DuplicatesStrategy.FAIL
     from sourceSets.main.java

multiplatform-annotations/build.gradle.kts

@@ -78,7 +78,7 @@ kotlin {
 
 val jvmJar by tasks.getting(Jar::class) {
     into ("META-INF/versions/9") {
-        from (project(":module-info").sourceSets["main"].output) {
+        from (project(":multiplatform-module-info").sourceSets["main"].output) {
             include("module-info.class")
         }
     }
@@ -87,7 +87,7 @@ val jvmJar by tasks.getting(Jar::class) {
 
 val jvmSourcesJar by tasks.getting(Jar::class) {
     into ("META-INF/versions/9") {
-        from (project(":module-info").sourceSets["main"].output) {
+        from (project(":multiplatform-module-info").sourceSets["main"].output) {
             include("module-info.class")
         }
     }

multiplatform-module-info/build.gradle

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2021 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
+ *
+ * https://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.
+ */
+
+sourceCompatibility = 1.9
+
+dependencies {
+    implementation project(':java-annotations')
+}
+
+compileJava {
+    // Without common sources, compiler complains that exported packages don't exist
+    source = [sourceSets.main.java, project(':java-annotations').sourceSets.main.java]
+}
+
+task mainJar(type: Jar) {
+}
+
+javadoc.enabled = false

multiplatform-module-info/src/main/java/module-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2020 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
+ *
+ * https://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.
+ */
+module org.jetbrains.multiplatform_annotations {
+  requires static java.desktop;
+  exports org.intellij.lang.annotations;
+  exports org.jetbrains.annotations;
+}

settings.gradle

@@ -16,4 +16,4 @@
 
 rootProject.name = 'annotations-parent'
 
-include 'java-annotations', 'module-info', 'multiplatform-annotations'
+include 'java-annotations', 'java-module-info', 'multiplatform-annotations', 'multiplatform-module-info'