From d9d5f0daa4a8eb721a9772658ebf3455825231ef Mon Sep 17 00:00:00 2001
From: Pascal Knecht <pascal@addere.ch>
Date: Wed, 11 Sep 2024 21:01:34 +0200
Subject: [PATCH] Include dependency model into connector plugin by applying
 shadow plugin

---
 .github/workflows/publishConnectorPlugin.yml |  7 +++++--
 connector-plugin/build.gradle.kts            | 22 +-------------------
 gradle.properties                            |  2 +-
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/publishConnectorPlugin.yml b/.github/workflows/publishConnectorPlugin.yml
index cf7f303..6453663 100644
--- a/.github/workflows/publishConnectorPlugin.yml
+++ b/.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 }}
diff --git a/connector-plugin/build.gradle.kts b/connector-plugin/build.gradle.kts
index 6cbd414..1a15226 100644
--- a/connector-plugin/build.gradle.kts
+++ b/connector-plugin/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
     id("ch.addere.dga.kotlin-library-conventions")
     `java-gradle-plugin`
-    `maven-publish`
-    id("com.gradle.plugin-publish") version "1.2.1"
+    id("com.gradle.plugin-publish") version "1.3.0"
 }
 
 description = "Gradle plugin that is injected into to be analysed Gradle projects"
@@ -30,22 +29,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"))
-}
diff --git a/gradle.properties b/gradle.properties
index b3765fd..759fb63 100644
--- a/gradle.properties
+++ b/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.3