🧱 Fix Gradle project (QD-9459)

JetBrains · Jul 9, 2024 · cef6958 · cef6958
1 parent 5436cb0
commit cef6958
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 85 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,39 +26,7 @@ jobs:
       - name: Run linters and test
         run: ./gradlew clean :plugin:build :plugin:publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_TOKEN }} -PbuildNumber=${{ env.PATCH_VERSION }}
       - name: Publish JAR to Space
-        run: |
-          cat <<EOF >> common/build.gradle.kts
-          publishing {
-            publications {
-              create<MavenPublication>("common") {
-                groupId = group.toString()
-                artifactId = "cli"
-                version = version.toString()
-                from(components["java"])
-                artifact(tasks["jarSources"])
-                pom {
-                  url.set("https://github.com/JetBrains/qodana-action")
-                  licenses {
-                    license {
-                      name.set("Apache-2.0")
-                      url.set("https://github.com/JetBrains/qodana-action/blob/main/LICENSE")
-                    }
-                  }
-                }
-              }
-            }
-            repositories {
-              maven {
-                url = uri("https://packages.jetbrains.team/maven/p/sa/maven-public")
-                credentials {
-                  username = System.getenv("JB_SPACE_INTELLIJ_CLIENT_ID")
-                  password = System.getenv("JB_SPACE_INTELLIJ_CLIENT_SECRET")
-                }
-              }
-            }
-          }
-          EOF
-          ./gradlew :common:publish
+        run: ./gradlew :plugin:publish -PbuildNumber=${{ env.PATCH_VERSION }}
         env:
           JB_SPACE_INTELLIJ_CLIENT_ID: ${{ secrets.MAVEN_SPACE_USERNAME }}
           JB_SPACE_INTELLIJ_CLIENT_SECRET: ${{ secrets.MAVEN_SPACE_PASSWORD }}

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
diff --git a/common/update-cli.js b/common/update-cli.js
@@ -6,7 +6,7 @@ const {readFileSync} = require("fs");
 const {execSync} = require("child_process");
 const path = require("path");
 const cliJsonPath = "./cli.json";
-const checksumsKtPath = "../common/src/main/kotlin/org/jetbrains/qodana/cli/Checksums.kt";
+const checksumsKtPath = "../plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt";
 
 const PLATFORMS = ["windows", "linux", "darwin"];
 const ARCHS = ["x86_64", "arm64"];

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -37,7 +37,6 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":common"))
     testImplementation(gradleTestKit())
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit"))
@@ -60,11 +59,6 @@ val sourcesJar = tasks.register<Jar>("sourcesJar") {
     from(sourceSets.main.get().allSource)
 }
 
-artifacts {
-    archives(javadocJar)
-    archives(sourcesJar)
-}
-
 tasks {
     test {
         val testGradleHome = layout.buildDirectory.asFile.get().resolve("testGradleHome")
@@ -93,3 +87,32 @@ gradlePlugin {
         tags = properties("tags").map { it.split(',') }
     }
 }
+
+publishing {
+    publications {
+        create<MavenPublication>("common") {
+            groupId = group.toString()
+            artifactId = "cli"
+            version = version.toString()
+            from(components["java"])
+            pom {
+                url.set("https://github.com/JetBrains/qodana-action")
+                licenses {
+                    license {
+                        name.set("Apache-2.0")
+                        url.set("https://github.com/JetBrains/qodana-action/blob/main/LICENSE")
+                    }
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            url = uri("https://packages.jetbrains.team/maven/p/sa/maven-public")
+            credentials {
+                username = System.getenv("JB_SPACE_INTELLIJ_CLIENT_ID")
+                password = System.getenv("JB_SPACE_INTELLIJ_CLIENT_SECRET")
+            }
+        }
+    }
+}
diff --git a/...lin/org/jetbrains/qodana/cli/Checksums.kt → .../kotlin/org/jetbrains/qodana/Checksums.kt b/...lin/org/jetbrains/qodana/cli/Checksums.kt → .../kotlin/org/jetbrains/qodana/Checksums.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.qodana.cli
+package org.jetbrains.qodana
 
 // CHECKSUMS is a map of Qodana CLI versions binaries and their checksums.
 // Note: the content of this file is generated by the build script. Do not modify it manually.

diff --git a/...kotlin/org/jetbrains/qodana/cli/Qodana.kt → ...ain/kotlin/org/jetbrains/qodana/Qodana.kt b/...kotlin/org/jetbrains/qodana/cli/Qodana.kt → ...ain/kotlin/org/jetbrains/qodana/Qodana.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.qodana.cli
+package org.jetbrains.qodana
 
 import java.io.File
 import java.io.FileInputStream

diff --git a/plugin/src/main/kotlin/org/jetbrains/qodana/QodanaPlugin.kt b/plugin/src/main/kotlin/org/jetbrains/qodana/QodanaPlugin.kt
@@ -19,7 +19,6 @@ package org.jetbrains.qodana
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.PluginInstantiationException
-import org.jetbrains.qodana.cli.Installer
 import org.jetbrains.qodana.tasks.QodanaScanTask
 
 class QodanaPlugin : Plugin<Project> {

diff --git a/plugin/src/main/kotlin/org/jetbrains/qodana/tasks/QodanaScanTask.kt b/plugin/src/main/kotlin/org/jetbrains/qodana/tasks/QodanaScanTask.kt
@@ -21,7 +21,7 @@ import org.gradle.api.GradleException
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.property
-import org.jetbrains.qodana.cli.Installer
+import org.jetbrains.qodana.Installer
 import org.jetbrains.qodana.QodanaPluginConstants.QODANA_ENV
 import org.jetbrains.qodana.QodanaPluginConstants.QODANA_ENV_NAME
 import java.io.ByteArrayOutputStream

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,6 +29,5 @@ plugins {
 }
 
 include(
-    ":plugin",
-    ":common",
+    ":plugin"
 )