Plugin update

.github/workflows/publishConnectorPlugin.yml

@@ -22,5 +22,8 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
 
-      - name: Build and publish connector plugin
-        run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PLUGIN_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PLUGIN_SECRET }}
+      - name: Validate connector plugin
+        run: ./gradlew :connector-plugin:validatePlugins
+
+      - name: Publish connector plugin
+        run: ./gradlew :connector-plugin:publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PLUGIN_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PLUGIN_SECRET }}

README.md

@@ -13,7 +13,7 @@ individual modules with the help of [Mermaid](https://mermaid.js.org/).
 graph TD
     vd2a57d(app) -->|implementation| va74ad8(core)
     vd2a57d(app) -->|implementation| v1bc49d(importer)
-    va02543(connector-plugin) -->|implementation| v91bd8e(connector-model)
+    va02543(connector-plugin) -->|compileOnly| v91bd8e(connector-model)
     v1bc49d(importer) -->|implementation| v91bd8e(connector-model)
     v1bc49d(importer) -->|implementation| va74ad8(core)
 ```
@@ -78,15 +78,12 @@ Download and setup this project:
 git clone https://github.com/ryru/dependency-graph-analyser.git
 cd dependency-graph-analyser/
 ./gradlew clean install
-./gradlew :connector-plugin:publishToMavenLocal
 ```
 
 1. Download the GitHub code repository
 2. Change into code directory
-3. Make a clean installation of the application (application will be available in the
-   directory `./app/build/install/dga/bin/dga`)
-4. Publish the Gradle tooling API plugin and its data model to Maven local (available in the
-   directory `~/.m2/repository/ch/addere/dga/`)
+3. Make a clean installation of the application (application will be available in the directory
+   `./app/build/install/dga/bin/dga`)
 
 Get an overview of this project by running `dga .`:
 
@@ -95,7 +92,7 @@ Get an overview of this project by running `dga .`:
 
 Analyse project "dependency-graph-analyser"
      5 modules
-     5 dependency configurations (1 unique dependency configurations)
+     5 dependency configurations (2 unique dependency configurations)
 
 ```
 
@@ -108,12 +105,12 @@ Use `dga . --chart-mermaid` to generate a Mermaid chart of this project:
 
 Analyse project "dependency-graph-analyser"
      5 modules
-     5 dependency configurations (1 unique dependency configurations)
+     5 dependency configurations (2 unique dependency configurations)
 
 graph TD
     vd2a57d(app) -->|implementation| va74ad8(core)
     vd2a57d(app) -->|implementation| v1bc49d(importer)
-    va02543(connector-plugin) -->|implementation| v91bd8e(connector-model)
+    va02543(connector-plugin) -->|compileOnly| v91bd8e(connector-model)
     v1bc49d(importer) -->|implementation| v91bd8e(connector-model)
     v1bc49d(importer) -->|implementation| va74ad8(core)
 
@@ -127,9 +124,9 @@ containing the dependencies originating from the module `app`:
 ```
 ./app/build/install/dga/bin/dga . -o app --mermaid-graph
 
- Analyse project "dependency-graph-analyser"
+Analyse project "dependency-graph-analyser"
      5 modules
-     5 dependency configurations (1 unique dependency configurations)
+     5 dependency configurations (2 unique dependency configurations)
 
 Applying filter on data results in:
      3 modules

app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ch.addere.dga.kotlin-application-conventions")
+    id("dga.application-conventions")
 }
 
 description = "CLI application project"

build-logic/build.gradle.kts → buildSrc/build.gradle.kts

@@ -7,11 +7,10 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
+    implementation("com.gradle.publish:plugin-publish-plugin:1.3.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
+    jvmToolchain(21)
 }

buildSrc/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "buildSrc"

buildSrc/src/main/kotlin/dga.application-conventions.gradle.kts

@@ -0,0 +1,4 @@
+plugins {
+    id("dga.common-conventions")
+    application
+}

buildSrc/src/main/kotlin/dga.library-conventions.gradle.kts

@@ -0,0 +1,4 @@
+plugins {
+    id("dga.common-conventions")
+    `java-library`
+}

buildSrc/src/main/kotlin/dga.plugin-conventions.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("dga.common-conventions")
+    `java-gradle-plugin`
+    id("com.gradle.plugin-publish")
+}

connector-model/build.gradle.kts

@@ -1,24 +1,8 @@
 plugins {
-    id("ch.addere.dga.kotlin-library-conventions")
-    `maven-publish`
+    id("dga.library-conventions")
 }
 
 description = "Data model of the analysed Gradle project"
 
 group = "ch.addere.dga.connectormodel"
 version = property("connectorPluginVersion").toString()
-
-publishing {
-    repositories {
-        maven {
-            name = "pluginRepo"
-            url = uri(layout.projectDirectory.dir("../build/pluginRepo"))
-        }
-
-        publications {
-            create<MavenPublication>("maven") {
-                from(components["kotlin"])
-            }
-        }
-    }
-}

connector-plugin/build.gradle.kts

@@ -1,8 +1,5 @@
 plugins {
-    id("ch.addere.dga.kotlin-library-conventions")
-    `java-gradle-plugin`
-    `maven-publish`
-    id("com.gradle.plugin-publish") version "1.2.1"
+    id("dga.plugin-conventions")
 }
 
 description = "Gradle plugin that is injected into to be analysed Gradle projects"
@@ -11,7 +8,13 @@ group = "ch.addere.dga.connectorplugin"
 version = property("connectorPluginVersion").toString()
 
 dependencies {
-    implementation(project(":connector-model"))
+    compileOnly(project(":connector-model"))
+}
+
+/* Include the :connector-model classes into the plugin jar to make it self-contained */
+tasks.named<Jar>("jar") {
+    from(project.sourceSets["main"].output)
+    from(project(":connector-model").sourceSets["main"].output)
 }
 
 gradlePlugin {
@@ -30,22 +33,3 @@ gradlePlugin {
         }
     }
 }
-
-publishing {
-    repositories {
-        maven {
-            name = "pluginRepo"
-            url = uri(layout.projectDirectory.dir("../build/pluginRepo"))
-        }
-
-        publications {
-            create<MavenPublication>("maven") {
-                from(components["kotlin"])
-            }
-        }
-    }
-}
-
-tasks.withType<PublishToMavenLocal> {
-    dependsOn(tasks.getByPath(":connector-model:publishToMavenLocal"))
-}

core/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ch.addere.dga.kotlin-library-conventions")
+    id("dga.library-conventions")
 }
 
 description = "Core logic for analysing dependency graphs"

gradle.properties

@@ -2,4 +2,4 @@
 # https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
 org.gradle.parallel=true
 org.gradle.caching=true
-connectorPluginVersion=0.1.2
+connectorPluginVersion=0.1.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

importer/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-    id("ch.addere.dga.kotlin-library-conventions")
+    id("dga.library-conventions")
     `java-gradle-plugin`
 }
 

importer/src/main/resources/init.gradle.kts

@@ -1,7 +1,6 @@
 initscript {
     repositories {
-        mavenLocal()
-        mavenCentral()
+        gradlePluginPortal()
     }
 
     dependencies {

settings.gradle.kts

@@ -1,9 +1,5 @@
-pluginManagement {
-    includeBuild("build-logic")
-}
-
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 rootProject.name = "dependency-graph-analyser"