Skip to content

Commit f9c7b20

Browse files
committed
Support Gradle 9.1.0. Update nmcp.
1 parent d6e85d8 commit f9c7b20

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
strategy:
8787
fail-fast: false
8888
matrix:
89-
gradle: [8.3, 8.4, 8.5, 8.8, "8.10.2", "8.12.1", "8.13", "8.14.3", "9.0.0"]
89+
gradle: [8.3, 8.4, 8.5, 8.8, "8.10.2", "8.12.1", "8.13", "8.14.3", "9.0.0", "9.1.0"]
9090
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif
9191
if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'pull_request'
9292
runs-on: ubuntu-latest

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ to the [Maven POM Manipulator Extension](https://github.com/release-engineering/
2222
Both plugins work in conjunction and therefore the same version is required for each. The analyzer plugin will inject a
2323
reference to the manipulation plugin.
2424

25-
The plugins are compatible with Gradle versions 4.10 through 7.x. Both running and building have been tested on these
25+
The plugins are compatible with Gradle versions 4.10 through 9.x. Both running and building have been tested on these
2626
versions. It may be possible to run with a 4.x version older than 4.10. However, it is likely that version 4.10 will
2727
remain the oldest version that is officially supported due to major changes between that version and older versions.
2828

analyzer/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ val prepareAnalyzerInit = artifacts.add("default", analyzerFile.get().asFile) {
179179
builtBy("processResources")
180180
}
181181

182+
// Using afterEvaluate : https://github.com/GradleUp/shadow/issues/1748
182183
afterEvaluate {
183184
configure<PublishingExtension> {
184185
publications {

build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ plugins {
6666
GradleVersion.current() >= GradleVersion.version("9.0.0") -> {
6767
id("com.adarshr.test-logger") version "4.0.0"
6868
id("com.gradleup.shadow") version "9.0.2" apply false
69+
id("com.gradleup.nmcp.aggregation") version "1.2.0" apply false
6970
}
7071
// For all Gradle 8.x after 8.3 (which is used for release). Note when running with release
7172
// enabled we were encountering https://github.com/GradleUp/shadow/issues/875
@@ -74,7 +75,7 @@ plugins {
7475
id("com.adarshr.test-logger") version "4.0.0"
7576
id("com.gradleup.shadow") version "8.3.9" apply false
7677
// TODO: Can't reset wrapper with this so for IntelliJ might need to be commented out :-(
77-
id("com.gradleup.nmcp.aggregation") version "1.1.0" apply false
78+
id("com.gradleup.nmcp.aggregation") version "1.2.0" apply false
7879
}
7980
}
8081

@@ -430,6 +431,7 @@ subprojects {
430431
}
431432
} else {
432433
publicationComponent = "pluginMaven"
434+
// Using afterEvaluate : https://github.com/GradleUp/shadow/issues/1748
433435
afterEvaluate {
434436
configure<PublishingExtension> {
435437
publications {
@@ -635,8 +637,8 @@ if (System.getProperty("release") != null) {
635637
throw GradleException("Pass release=true as a -P parameter")
636638
}
637639

638-
if (GradleVersion.current() >= GradleVersion.version("8.3") &&
639-
GradleVersion.current() < GradleVersion.version("9.0.0")) {
640+
if (GradleVersion.current() >= GradleVersion.version("8.3") )
641+
{
640642
// LinkageError: loader constraint violation from GMEFunctionalTest otherwise
641643
if (System.getProperty("gmeFunctionalTest") == null) {
642644
val mavenExtension =

0 commit comments

Comments
 (0)