From 243b2f7a3c197bed7d8a6510f742defd745c9f94 Mon Sep 17 00:00:00 2001 From: Sergei Sysoev Date: Thu, 27 Jun 2024 03:55:28 +0200 Subject: [PATCH] Remove Java artifact --- build.gradle | 2 +- java-annotations/build.gradle | 69 ------------------- .../annotations/verification.properties | 3 - java-module-info/build.gradle | 31 --------- .../src/main/java/module-info.java | 20 ------ settings.gradle | 2 +- 6 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 java-annotations/build.gradle delete mode 100644 java-annotations/src/main/resources/META-INF/org/jetbrains/annotations/verification.properties delete mode 100644 java-module-info/build.gradle delete mode 100644 java-module-info/src/main/java/module-info.java diff --git a/build.gradle b/build.gradle index 47ed6fc..5b83b0f 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ subprojects { apply plugin: 'signing' } -configure([project(':java-annotations'), project(':multiplatform-annotations')]) { +configure([project(':multiplatform-annotations')]) { publishing { publications.withType(MavenPublication) { group 'org.jetbrains' diff --git a/java-annotations/build.gradle b/java-annotations/build.gradle deleted file mode 100644 index 2fa093e..0000000 --- a/java-annotations/build.gradle +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.8 -project.archivesBaseName = 'annotations' - -task mainJar(type: Jar) { - into ("META-INF/versions/9", { - from (project(':java-module-info').sourceSets.main.output, { - // Skip extra files from common sources compiled with Java 9 target - include("module-info.class") - }) - }) - manifest.attributes("Multi-Release": true) - from sourceSets.main.output - duplicatesStrategy = DuplicatesStrategy.FAIL -} - -task sourceJar(type: Jar) { - into ("META-INF/versions/9", { - from project(':java-module-info').sourceSets.main.java - }) - duplicatesStrategy = DuplicatesStrategy.FAIL - from sourceSets.main.java - baseName = archivesBaseName + '-sources' -} - -task javadocJar(type: Jar) { - duplicatesStrategy = DuplicatesStrategy.FAIL - from javadoc -} - -javadoc { - source = [sourceSets.main.java] -} - -artifacts { - archives mainJar, sourceJar -} - -model { - publishing { - publications { - pluginMaven(MavenPublication) { - artifactId archivesBaseName - artifact mainJar - artifact sourceJar { - classifier 'sources' - } - artifact javadocJar { - classifier 'javadoc' - } - } - } - } -} \ No newline at end of file diff --git a/java-annotations/src/main/resources/META-INF/org/jetbrains/annotations/verification.properties b/java-annotations/src/main/resources/META-INF/org/jetbrains/annotations/verification.properties deleted file mode 100644 index 8311496..0000000 --- a/java-annotations/src/main/resources/META-INF/org/jetbrains/annotations/verification.properties +++ /dev/null @@ -1,3 +0,0 @@ -#This is the verification token for the org.jetbrains:annotations SDK. -#Tue May 07 23:54:59 PDT 2024 -token=WREIUZVB7ZATTLUBCE6X3VEMXU diff --git a/java-module-info/build.gradle b/java-module-info/build.gradle deleted file mode 100644 index 75c0e99..0000000 --- a/java-module-info/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 diff --git a/java-module-info/src/main/java/module-info.java b/java-module-info/src/main/java/module-info.java deleted file mode 100644 index f509a6b..0000000 --- a/java-module-info/src/main/java/module-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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.annotations { - requires static java.desktop; - exports org.intellij.lang.annotations; - exports org.jetbrains.annotations; -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a55f86f..9a9c3e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,4 +16,4 @@ rootProject.name = 'annotations-parent' -include 'java-annotations', 'java-module-info', 'multiplatform-annotations' \ No newline at end of file +include 'multiplatform-annotations' \ No newline at end of file