Skip to content

Commit 1332a99

Browse files
committed
Update dependencies and remove deploy convention plugin
1 parent 42c4665 commit 1332a99

File tree

6 files changed

+12
-67
lines changed

6 files changed

+12
-67
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
cache-read-only: true
4242
# Disable CC due to https://github.com/gradle/gradle/issues/22779
43-
- run: ./gradlew publish --no-configuration-cache
43+
- run: ./gradlew publishToMavenCentral --no-configuration-cache
4444
env:
4545
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
4646
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}

.github/workflows/release.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,11 @@ jobs:
2020
- uses: gradle/actions/setup-gradle@v4
2121
with:
2222
cache-read-only: true
23-
- uses: actions/setup-node@v4
24-
with:
25-
# Due to some limitations of https://github.com/node-gradle/gradle-node-plugin.
26-
node-version: '16'
2723
# Disable CC due to https://github.com/gradle/gradle/issues/22779
28-
- run: ./gradlew release --no-configuration-cache
24+
- run: ./gradlew publishToMavenCentral publishPlugins --no-configuration-cache
2925
env:
3026
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_KEY }}
3127
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_SECRET }}
32-
# We must declare repository_owner as the user, workaround for https://github.com/ajoberstar/gradle-git-publish/issues/109.
33-
GRGIT_USER: ${{ github.repository_owner }}
34-
# https://ajoberstar.org/grgit/main/grgit-authentication.html#_environment_variables
35-
GRGIT_PASS: ${{ secrets.GITHUB_TOKEN }}
3628
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
3729
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}
3830
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY }}

build-logic/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ repositories {
88
}
99

1010
dependencies {
11-
implementation("com.gradle.publish:plugin-publish-plugin:1.3.0")
12-
implementation("com.vanniktech:gradle-maven-publish-plugin:0.30.0")
13-
implementation("org.ajoberstar.git-publish:gradle-git-publish:4.2.2")
14-
implementation("com.github.node-gradle:gradle-node-plugin:7.1.0")
11+
implementation("com.gradle.publish:plugin-publish-plugin:1.3.1")
12+
implementation("com.vanniktech:gradle-maven-publish-plugin:0.32.0")
1513
}

build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts

Lines changed: 0 additions & 37 deletions
This file was deleted.

build.gradle.kts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ plugins {
22
groovy
33
`java-gradle-plugin`
44
id("shadow.convention.publish")
5-
id("shadow.convention.deploy")
6-
id("com.diffplug.spotless") version "7.0.0.BETA4"
5+
id("com.diffplug.spotless") version "7.0.4"
76
}
87

98
java {
@@ -23,22 +22,22 @@ dependencies {
2322
compileOnly(localGroovy())
2423

2524
implementation("org.jdom:jdom2:2.0.6.1")
26-
implementation("org.ow2.asm:asm-commons:9.7.1")
27-
implementation("commons-io:commons-io:2.17.0")
25+
implementation("org.ow2.asm:asm-commons:9.8")
26+
implementation("commons-io:commons-io:2.19.0")
2827
implementation("org.apache.ant:ant:1.10.15")
2928
implementation("org.codehaus.plexus:plexus-utils:4.0.2")
30-
implementation("org.codehaus.plexus:plexus-xml:4.0.4")
29+
implementation("org.codehaus.plexus:plexus-xml:4.1.0")
3130
implementation("org.apache.logging.log4j:log4j-core:2.24.1")
32-
implementation("org.vafer:jdependency:2.12")
31+
implementation("org.vafer:jdependency:2.13")
3332

3433
testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") {
3534
exclude(group = "org.codehaus.groovy")
3635
exclude(group = "org.hamcrest")
3736
}
38-
testImplementation("org.xmlunit:xmlunit-legacy:2.10.0")
37+
testImplementation("org.xmlunit:xmlunit-legacy:2.10.2")
3938
testImplementation("org.apache.commons:commons-lang3:3.17.0")
4039
testImplementation("com.google.guava:guava:33.3.1-jre")
41-
testImplementation(platform("org.junit:junit-bom:5.11.3"))
40+
testImplementation(platform("org.junit:junit-bom:5.13.1"))
4241
testImplementation("org.junit.jupiter:junit-jupiter")
4342
testImplementation("org.junit.platform:junit-platform-suite-engine")
4443
}
@@ -71,10 +70,3 @@ tasks.withType<Test>().configureEach {
7170
"java.base/java.net=ALL-UNNAMED",
7271
)
7372
}
74-
75-
tasks.register("release") {
76-
dependsOn(
77-
tasks.publish,
78-
tasks.publishPlugins,
79-
)
80-
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pluginManagement {
88
}
99

1010
plugins {
11-
id("com.gradle.develocity") version "3.18.2"
11+
id("com.gradle.develocity") version "4.0.2"
1212
}
1313

1414
develocity {

0 commit comments

Comments
 (0)