Refactor Gradle build layout

ryru · Sep 14, 2024 · 884fac6 · 884fac6
1 parent 14d288b
commit 884fac6
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 55 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ch.addere.dga.kotlin-application-conventions")
+    id("dga.application-conventions")
 }
 
 description = "CLI application project"

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
diff --git a/build-logic/src/main/kotlin/ch.addere.dga.kotlin-application-conventions.gradle.kts b/build-logic/src/main/kotlin/ch.addere.dga.kotlin-application-conventions.gradle.kts
diff --git a/build-logic/src/main/kotlin/ch.addere.dga.kotlin-library-conventions.gradle.kts b/build-logic/src/main/kotlin/ch.addere.dga.kotlin-library-conventions.gradle.kts
diff --git a/build-logic/build.gradle.kts → buildSrc/build.gradle.kts b/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)
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "buildSrc"
diff --git a/buildSrc/src/main/kotlin/dga.application-conventions.gradle.kts b/buildSrc/src/main/kotlin/dga.application-conventions.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("dga.common-conventions")
+    application
+}
diff --git a/....dga.kotlin-common-conventions.gradle.kts → .../kotlin/dga.common-conventions.gradle.kts b/....dga.kotlin-common-conventions.gradle.kts → .../kotlin/dga.common-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/dga.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/dga.library-conventions.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("dga.common-conventions")
+    `java-library`
+}
diff --git a/buildSrc/src/main/kotlin/dga.plugin-conventions.gradle.kts b/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")
+}
diff --git a/connector-model/build.gradle.kts b/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"])
-            }
-        }
-    }
-}
diff --git a/connector-plugin/build.gradle.kts b/connector-plugin/build.gradle.kts
@@ -1,7 +1,5 @@
 plugins {
-    id("ch.addere.dga.kotlin-library-conventions")
-    `java-gradle-plugin`
-    id("com.gradle.plugin-publish") version "1.3.0"
+    id("dga.plugin-conventions")
 }
 
 description = "Gradle plugin that is injected into to be analysed Gradle projects"

diff --git a/core/build.gradle.kts b/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"
diff --git a/importer/build.gradle.kts b/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`
 }
 

diff --git a/settings.gradle.kts b/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"