Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: consistent naming of Gradle configuration files / Gradle updates #12997

Merged
merged 4 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
84 changes: 0 additions & 84 deletions build-logic/project-plugins/src/main/kotlin/Utils.kt

This file was deleted.

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions build-logic/settings.gradle.kts

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

plugins { id("com.hedera.hashgraph.root") }
plugins { id("com.hedera.gradle.root") }
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,23 @@ 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("io.github.gradle-nexus:publish-plugin:1.3.0")
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.5")
implementation("org.owasp:dependency-check-gradle:9.1.0")
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

plugins {
id("application")
id("com.hedera.hashgraph.java")
id("com.hedera.gradle.java")
}

group = "com.swirlds"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@

plugins {
id("java")
id("com.hedera.hashgraph.maven-publish")
id("com.hedera.gradle.maven-publish")
}

publishing {
publications {
named<MavenPublication>("maven") {
pom.developers {
// TODO fill this
developer {
name = "Release Engineering Team"
email = "release-engineering@swirldslabs.com"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

plugins {
id("java-library")
id("com.hedera.hashgraph.java")
id("com.hedera.gradle.java")
}

group = "com.hedera.storage"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

plugins {
id("java")
id("com.hedera.hashgraph.maven-publish")
id("com.hedera.gradle.maven-publish")
}

publishing {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

plugins {
id("java-library")
id("com.hedera.hashgraph.java")
id("com.hedera.gradle.java")
}

group = "com.hedera.evm"
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,23 @@
* 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.gradle.services.TaskLockService
import com.hedera.gradle.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.gradle.lifecycle")
id("com.hedera.gradle.jpms-modules")
id("com.hedera.gradle.jpms-module-dependencies")
id("com.hedera.gradle.repositories")
id("com.hedera.gradle.spotless-java")
id("com.hedera.gradle.spotless-kotlin")
}

version =
Expand Down Expand Up @@ -138,8 +136,8 @@ normalization.runtimeClasspath { ignore("git.properties") }
tasks.withType<AbstractArchiveTask>().configureEach {
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
fileMode = 436 // octal: 0664
dirMode = 509 // octal: 0775
filePermissions { unix("0664") }
dirPermissions { unix("0775") }
}

tasks.jar { exclude("**/classpath.index") }
Expand Down Expand Up @@ -240,7 +238,6 @@ testing {
group = "build"
shouldRunAfter(tasks.test)
maxHeapSize = "8g"
addTestListener(testLogger())
}
}
}
Expand Down