Migrate from buildSrc to build-logic

chkpnt · Nov 18, 2023 · 0b72d27 · 0b72d27
1 parent 93f19e9
commit 0b72d27
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 28 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/buildSrc/build.gradle → build-logic/build.gradle b/buildSrc/build.gradle → build-logic/build.gradle
@@ -4,15 +4,13 @@ plugins {
 
 repositories {
     gradlePluginPortal()
-    maven { url("https://maven.hello2morrow.com/repository") }
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31") // should match Kotlin version bundled with Gradle
     implementation("com.gradle.publish:plugin-publish-plugin:0.19.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.1.2")
     implementation("org.ajoberstar.git-publish:gradle-git-publish:3.0.1")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
-    implementation("com.hello2morrow:sonargraph-gradle-plugin:8.8.0")
+    // implementation("com.hello2morrow:sonargraph-gradle-plugin:8.8.0")
     implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3")
 }
diff --git a/buildSrc/settings.gradle → build-logic/settings.gradle b/buildSrc/settings.gradle → build-logic/settings.gradle
diff --git a/...main/groovy/truststorebuilder-docs.gradle → ...main/groovy/truststorebuilder-docs.gradle b/...main/groovy/truststorebuilder-docs.gradle → ...main/groovy/truststorebuilder-docs.gradle
diff --git a/...n/groovy/truststorebuilder-publish.gradle → ...n/groovy/truststorebuilder-publish.gradle b/...n/groovy/truststorebuilder-publish.gradle → ...n/groovy/truststorebuilder-publish.gradle
diff --git a/...c/main/groovy/truststorebuilder-qa.gradle → ...c/main/groovy/truststorebuilder-qa.gradle b/...c/main/groovy/truststorebuilder-qa.gradle → ...c/main/groovy/truststorebuilder-qa.gradle
@@ -1,7 +1,7 @@
 plugins {
     id("jacoco")
     id "org.sonarqube"
-    id "com.hello2morrow.sonargraph"
+//    id "com.hello2morrow.sonargraph"
 }
 
 /***************************
@@ -40,27 +40,27 @@ sonarqube {
 }
 
 /*********************************
- * Sonargraph
+ * Sonargraph (inactive)
  *********************************/
-
-sonargraphDynamicReport {
-    activationCode = System.getenv("SONARGRAPH_ACTIVATION_CODE")
-    prepareForSonarQube = true
-    reportType = "full"
-    reportFormat = "xml, html"
-    qualityModelFile = "Sonargraph:Java.sgqm" //default Java quality model
-    reportFileName = "sonargraph"
-    failSet	{
-        failOnEmptyWorkspace = true
-    }
-}
-
-// Unfortunately, sonargraphDynamicReport.reportDirectory returns
-// not the default value but null if not set explicitly :-/
-task prepareSonargraphReportForGhPages(type: Copy) {
-    from "$buildDir/sonargraph"
-    into "${ghPagesGroomingDir}/reports"
-    exclude '*.xml'
-}
-
-tasks["sonargraphDynamicReport"].finalizedBy(prepareSonargraphReportForGhPages)
+//
+//sonargraphDynamicReport {
+//    activationCode = System.getenv("SONARGRAPH_ACTIVATION_CODE")
+//    prepareForSonarQube = true
+//    reportType = "full"
+//    reportFormat = "xml, html"
+//    qualityModelFile = "Sonargraph:Java.sgqm" //default Java quality model
+//    reportFileName = "sonargraph"
+//    failSet	{
+//        failOnEmptyWorkspace = true
+//    }
+//}
+//
+//// Unfortunately, sonargraphDynamicReport.reportDirectory returns
+//// not the default value but null if not set explicitly :-/
+//task prepareSonargraphReportForGhPages(type: Copy) {
+//    from "$buildDir/sonargraph"
+//    into "${ghPagesGroomingDir}/reports"
+//    exclude '*.xml'
+//}
+//
+//tasks["sonargraphDynamicReport"].finalizedBy(prepareSonargraphReportForGhPages)
diff --git a/.../groovy/truststorebuilder-spotless.gradle → .../groovy/truststorebuilder-spotless.gradle b/.../groovy/truststorebuilder-spotless.gradle → .../groovy/truststorebuilder-spotless.gradle
diff --git a/...roovy/truststorebuilder-versioning.gradle → ...roovy/truststorebuilder-versioning.gradle b/...roovy/truststorebuilder-versioning.gradle → ...roovy/truststorebuilder-versioning.gradle
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id "java-gradle-plugin"
 	id "groovy"
-	id "org.jetbrains.kotlin.jvm"
+	id "org.jetbrains.kotlin.jvm" version "1.5.31" // should match Kotlin version bundled with Gradle
 	id "truststorebuilder-versioning"
 	id "truststorebuilder-docs"
 	id "truststorebuilder-publish"

diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,4 @@
+pluginManagement {
+    // Include 'plugins build' to define convention plugins.
+    includeBuild('build-logic')
+}