build: consistent naming of Gradle configuration files / Gradle updates

Signed-off-by: Jendrik Johannes <[email protected]>
hashgraph · Apr 25, 2024 · 868c44e · 868c44e
1 parent dccbceb
commit 868c44e
Show file tree

Hide file tree

Showing 106 changed files with 331 additions and 498 deletions.
diff --git a/block-node/blocknode-core-spi/build.gradle.kts b/block-node/blocknode-core-spi/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/block-node/blocknode-core/build.gradle.kts b/block-node/blocknode-core/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/block-node/blocknode-filesystem-api/build.gradle.kts b/block-node/blocknode-filesystem-api/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/block-node/blocknode-filesystem-local/build.gradle.kts b/block-node/blocknode-filesystem-local/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/block-node/blocknode-filesystem-s3/build.gradle.kts b/block-node/blocknode-filesystem-s3/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/block-node/blocknode-grpc-api/build.gradle.kts b/block-node/blocknode-grpc-api/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/block-node/blocknode-state/build.gradle.kts b/block-node/blocknode-state/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.blocknode.conventions") }
+plugins { id("com.hedera.gradlebuild.blocknode") }
diff --git a/build-logic/project-plugins/src/main/kotlin/Utils.kt b/build-logic/project-plugins/src/main/kotlin/Utils.kt
diff --git a/...logic/project-plugins/src/main/kotlin/com.hedera.hashgraph.dependency-analysis.gradle.kts b/...logic/project-plugins/src/main/kotlin/com.hedera.hashgraph.dependency-analysis.gradle.kts
diff --git a/...ject-plugins/src/main/kotlin/com/hedera/hashgraph/gradlebuild/services/TaskLockService.kt b/...ject-plugins/src/main/kotlin/com/hedera/hashgraph/gradlebuild/services/TaskLockService.kt
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.hashgraph.root") }
+plugins { id("com.hedera.gradlebuild.root") }
diff --git a/example-apps/swirlds-platform-base-example/build.gradle.kts b/example-apps/swirlds-platform-base-example/build.gradle.kts
@@ -16,7 +16,7 @@
 
 plugins {
     id("application")
-    id("com.hedera.hashgraph.sdk.conventions")
+    id("com.hedera.gradlebuild.platform")
 }
 
 mainModuleInfo {

diff --git a/build-logic/project-plugins/build.gradle.kts → gradle/plugins/build.gradle.kts b/build-logic/project-plugins/build.gradle.kts → gradle/plugins/build.gradle.kts
@@ -20,19 +20,22 @@ plugins {
     `kotlin-dsl`
 }
 
+repositories { gradlePluginPortal() }
+
 dependencies {
     implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
-    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:1.29.0")
+    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:1.31.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
     implementation("com.github.johnrengelman:shadow:8.1.1")
     implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
+    implementation("com.gradle:develocity-gradle-plugin:3.17.2")
     implementation(
         "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.1"
     )
     implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
     implementation("net.swiftzer.semver:semver:1.3.0")
     implementation("org.gradlex:extra-java-module-info:1.8")
-    implementation("org.gradlex:java-ecosystem-capabilities:1.5.1")
-    implementation("org.gradlex:java-module-dependencies:1.6.2")
-    implementation("org.owasp:dependency-check-gradle:9.0.9")
+    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.0")
+    implementation("org.gradlex:java-module-dependencies:1.6.4")
+    implementation("org.owasp:dependency-check-gradle:9.1.0")
 }
diff --git a/...ra.hashgraph.aggregate-reports.gradle.kts → ....gradlebuild.aggregate-reports.gradle.kts b/...ra.hashgraph.aggregate-reports.gradle.kts → ....gradlebuild.aggregate-reports.gradle.kts
diff --git a/...m.hedera.hashgraph.application.gradle.kts → ...hedera.gradlebuild.application.gradle.kts b/...m.hedera.hashgraph.application.gradle.kts → ...hedera.gradlebuild.application.gradle.kts
@@ -16,7 +16,7 @@
 
 plugins {
     id("application")
-    id("com.hedera.hashgraph.java")
+    id("com.hedera.gradlebuild.java")
 }
 
 group = "com.swirlds"

diff --git a/...ashgraph.benchmark-conventions.gradle.kts → ...m.hedera.gradlebuild.benchmark.gradle.kts b/...ashgraph.benchmark-conventions.gradle.kts → ...m.hedera.gradlebuild.benchmark.gradle.kts
diff --git a/...ashgraph.blocknode.conventions.gradle.kts → ...m.hedera.gradlebuild.blocknode.gradle.kts b/...ashgraph.blocknode.conventions.gradle.kts → ...m.hedera.gradlebuild.blocknode.gradle.kts
@@ -16,7 +16,7 @@
 
 plugins {
     id("java-library")
-    id("com.hedera.hashgraph.java")
+    id("com.hedera.gradlebuild.java")
 }
 
 group = "com.hedera.storage"

diff --git a/...ra.hashgraph.evm-maven-publish.gradle.kts → ....gradlebuild.evm-maven-publish.gradle.kts b/...ra.hashgraph.evm-maven-publish.gradle.kts → ....gradlebuild.evm-maven-publish.gradle.kts
@@ -16,7 +16,7 @@
 
 plugins {
     id("java")
-    id("com.hedera.hashgraph.maven-publish")
+    id("com.hedera.gradlebuild.maven-publish")
 }
 
 publishing {

diff --git a/...a.hashgraph.java-test-fixtures.gradle.kts → ...gradlebuild.java-test-fixtures.gradle.kts b/...a.hashgraph.java-test-fixtures.gradle.kts → ...gradlebuild.java-test-fixtures.gradle.kts
diff --git a/...tlin/com.hedera.hashgraph.java.gradle.kts → ...in/com.hedera.gradlebuild.java.gradle.kts b/...tlin/com.hedera.hashgraph.java.gradle.kts → ...in/com.hedera.gradlebuild.java.gradle.kts
@@ -14,25 +14,24 @@
  * limitations under the License.
  */
 
-import Utils.Companion.testLogger
-import Utils.Companion.versionTxt
 import com.adarshr.gradle.testlogger.theme.ThemeType
 import com.autonomousapps.AbstractExtension
 import com.autonomousapps.DependencyAnalysisSubExtension
-import com.hedera.hashgraph.gradlebuild.services.TaskLockService
+import com.hedera.gradlebuild.services.TaskLockService
+import com.hedera.gradlebuild.utils.Utils.testLogger
+import com.hedera.gradlebuild.utils.Utils.versionTxt
 
 plugins {
     id("java")
     id("jacoco")
     id("checkstyle")
     id("com.adarshr.test-logger")
-    id("com.hedera.hashgraph.lifecycle")
-    id("com.hedera.hashgraph.jpms-modules")
-    id("com.hedera.hashgraph.jpms-module-dependencies")
-    id("com.hedera.hashgraph.repositories")
-    id("com.hedera.hashgraph.spotless-conventions")
-    id("com.hedera.hashgraph.spotless-java-conventions")
-    id("com.hedera.hashgraph.spotless-kotlin-conventions")
+    id("com.hedera.gradlebuild.lifecycle")
+    id("com.hedera.gradlebuild.jpms-modules")
+    id("com.hedera.gradlebuild.jpms-module-dependencies")
+    id("com.hedera.gradlebuild.repositories")
+    id("com.hedera.gradlebuild.spotless-java")
+    id("com.hedera.gradlebuild.spotless-kotlin")
 }
 
 version =

diff --git a/...graph.jpms-module-dependencies.gradle.kts → ...build.jpms-module-dependencies.gradle.kts b/...graph.jpms-module-dependencies.gradle.kts → ...build.jpms-module-dependencies.gradle.kts