Skip to content

Commit 4bd321b

Browse files
rncrnc
committed
Remove redundant qualifier/patch using fix-build.sh
1 parent 9da7081 commit 4bd321b

5 files changed

Lines changed: 51 additions & 40 deletions

File tree

‎analyzer/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group = "org.jboss.gm"
88
// According to https://plugins.gradle.org/docs/publish-plugin the simplifications in plugin publishing requires
99
// Gradle 7.6 or later. Therefore use reflection here.
1010
gradlePlugin {
11-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.6")) {
11+
if (GradleVersion.current() >= GradleVersion.version("7.6")) {
1212
var pluginPublishMethod = GradlePluginDevelopmentExtension::class.memberFunctions.find{it.name == "getWebsite"}
1313
@Suppress("UNCHECKED_CAST")
1414
var wProperty: Property<String> = pluginPublishMethod?.call(this) as Property<String>
@@ -26,7 +26,7 @@ gradlePlugin {
2626
implementationClass = "org.jboss.gm.analyzer.alignment.AlignmentPlugin"
2727
displayName = "GME Manipulation Plugin"
2828

29-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.6")) {
29+
if (GradleVersion.current() >= GradleVersion.version("7.6")) {
3030
var getTagsMethod = PluginDeclaration::class.memberFunctions.find { it.name == "getTags" }
3131
@Suppress("UNCHECKED_CAST")
3232
var sProperty = getTagsMethod?.call(this) as SetProperty<String>
@@ -123,7 +123,7 @@ idea.module {
123123
// testSources / testResources only available from 7.4 and greater so can't just do:
124124
// testSources.from(sourceSets["functionalTest"].java.srcDirs)
125125
// Not bothering to handle other versions as we're developing on later Gradle now.
126-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
126+
if (GradleVersion.current() >= GradleVersion.version("7.4")) {
127127
var rTestSources = IdeaModule::class.memberFunctions.find{it.name == "getTestSources"}
128128
var fileCollection = rTestSources?.call(this) as ConfigurableFileCollection
129129
fileCollection.from(sourceSets["functionalTest"].java.srcDirs)

‎build.gradle.kts‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ plugins {
2121
idea
2222

2323
// Note spotless is only active for Gradle >= 6.1.1. Using 6.8.3 for the extra fixes.
24-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("6.8.3")) {
24+
if (GradleVersion.current() >= GradleVersion.version("6.8.3")) {
2525
id("com.diffplug.spotless") version "7.2.1"
26-
} else if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.4")) {
26+
} else if (GradleVersion.current() < GradleVersion.version("5.4")) {
2727
id("com.diffplug.gradle.spotless") version "4.5.1"
2828
} else {
2929
id("com.diffplug.spotless") version "5.14.2"
3030
}
3131

32-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("6.0")) {
32+
if (GradleVersion.current() >= GradleVersion.version("6.0")) {
3333
id("com.gradle.plugin-publish") version "1.3.1" apply false
3434
} else {
3535
id("com.gradle.plugin-publish") version "0.21.0"
@@ -42,28 +42,28 @@ plugins {
4242
id("io.github.rmanibus.maven-settings") version "0.8" apply false
4343

4444
when {
45-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.0") -> {
45+
GradleVersion.current() < GradleVersion.version("5.0") -> {
4646
id("com.adarshr.test-logger") version "1.7.1"
4747
// XXX: Versions 4.x > 4.0.1 suffer from <https://github.com/johnrengelman/shadow/issues/425>
4848
id("com.github.johnrengelman.shadow") version "4.0.1" apply false
4949
}
50-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("6.0") -> {
50+
GradleVersion.current() < GradleVersion.version("6.0") -> {
5151
id("com.adarshr.test-logger") version "2.1.1"
5252
id("com.github.johnrengelman.shadow") version "5.2.0" apply false
5353
}
54-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("7.0") -> {
54+
GradleVersion.current() < GradleVersion.version("7.0") -> {
5555
id("com.adarshr.test-logger") version "2.1.1"
5656
id("com.github.johnrengelman.shadow") version "6.1.0" apply false
5757
}
58-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("8.0") -> {
58+
GradleVersion.current() < GradleVersion.version("8.0") -> {
5959
id("com.adarshr.test-logger") version "3.2.0"
6060
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
6161
}
62-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("8.3") -> {
62+
GradleVersion.current() < GradleVersion.version("8.3") -> {
6363
id("com.adarshr.test-logger") version "3.2.0"
6464
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
6565
}
66-
org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("9.0.0") -> {
66+
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
6969
}
@@ -79,16 +79,16 @@ plugins {
7979
}
8080

8181
when {
82-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.0") -> {
82+
GradleVersion.current() < GradleVersion.version("5.0") -> {
8383
id("io.freefair.lombok") version "2.9.5" apply false
8484
}
85-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.2") -> {
85+
GradleVersion.current() < GradleVersion.version("5.2") -> {
8686
id("io.freefair.lombok") version "3.0.0" apply false
8787
}
88-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("6.0") -> {
88+
GradleVersion.current() < GradleVersion.version("6.0") -> {
8989
id("io.freefair.lombok") version "4.1.6" apply false
9090
}
91-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("8.0") -> {
91+
GradleVersion.current() < GradleVersion.version("8.0") -> {
9292
id("io.freefair.lombok") version "5.3.3.3" apply false
9393
}
9494
else -> {
@@ -99,27 +99,27 @@ plugins {
9999
// Not compatible with Gradle 9 yet.
100100
// https://github.com/kordamp/kordamp-gradle-plugins/issues/540
101101
// See also below as a fake task for AggregateJacocoReport has been created for Gradle 9
102-
if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("9.0.0")) {
103-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("8.0")) {
102+
if (GradleVersion.current() < GradleVersion.version("9.0.0")) {
103+
if (GradleVersion.current() >= GradleVersion.version("8.0")) {
104104
id("org.kordamp.gradle.jacoco") version "0.54.0"
105-
} else if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.0")) {
105+
} else if (GradleVersion.current() >= GradleVersion.version("7.0")) {
106106
id("org.kordamp.gradle.jacoco") version "0.47.0"
107-
} else if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("5.3")) {
107+
} else if (GradleVersion.current() >= GradleVersion.version("5.3")) {
108108
id("org.kordamp.gradle.jacoco") version "0.46.0"
109109
}
110110
}
111111
}
112112

113113
// XXX: Jacoco plugin only supports Gradle >= 5.3 ; create empty task on those Gradle versions so that build does not fail
114-
if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.3")
115-
|| org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("9.0.0")
114+
if (GradleVersion.current() < GradleVersion.version("5.3")
115+
|| GradleVersion.current() >= GradleVersion.version("9.0.0")
116116
) {
117117
tasks.register("AggregateJacocoReport")
118118
}
119119

120120
if (!JavaVersion.current().isJava11Compatible) {
121121
throw GradleException("This build must be run with at least Java 11")
122-
} else if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("4.10")) {
122+
} else if (GradleVersion.current() < GradleVersion.version("4.10")) {
123123
throw GradleException("This build must be run with at least Gradle 4.10")
124124
}
125125

@@ -246,7 +246,7 @@ subprojects {
246246
extra["slf4jVersion"] = "2.0.17"
247247
extra["systemStubsVersion"] = "2.1.8"
248248

249-
if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.4")) {
249+
if (GradleVersion.current() < GradleVersion.version("5.4")) {
250250
apply(plugin = "com.diffplug.gradle.spotless")
251251
} else {
252252
apply(plugin = "com.diffplug.spotless")
@@ -259,8 +259,8 @@ subprojects {
259259
extra["lombokVersion"] = extensions.findByType(LombokExtension::class)?.version
260260

261261
// XXX: Lombok plugin 3.x < 3.6.1 suffers from <https://github.com/freefair/gradle-plugins/issues/31>
262-
if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("5.0")
263-
|| org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("5.2")) {
262+
if (GradleVersion.current() < GradleVersion.version("5.0")
263+
|| GradleVersion.current() >= GradleVersion.version("5.2")) {
264264
// Don't generate lombok.config files ( https://docs.freefair.io/gradle-plugins/3.6.6/reference/#_lombok_config_handling )
265265
tasks.findByName("generateLombokConfig")?.enabled = false
266266
}
@@ -361,7 +361,7 @@ subprojects {
361361
* Another great source of information is the configuration of the shadow plugin itself:
362362
* https://github.com/johnrengelman/shadow/blob/main/build.gradle
363363
*/
364-
if (org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("8.3")) {
364+
if (GradleVersion.current() < GradleVersion.version("8.3")) {
365365
apply(plugin = "com.github.johnrengelman.shadow")
366366
} else {
367367
apply(plugin = "com.gradleup.shadow")
@@ -379,7 +379,7 @@ subprojects {
379379
exclude("analyzer-init.gradle")
380380

381381
// XXX: Skip minimization for Gradle 4.10 (ShadowJar 4.0.1) due to missing classes
382-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("5.0")) {
382+
if (GradleVersion.current() >= GradleVersion.version("5.0")) {
383383
// Minimise the resulting uber-jars to ensure we don't have massive jars
384384
minimize {
385385
// Sometimes minimisation takes away too much ... ensure we keep these.
@@ -416,7 +416,7 @@ subprojects {
416416

417417
// configure publishing of the shadowJar
418418
var publicationComponent = "shadow"
419-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("8.3")) {
419+
if (GradleVersion.current() >= GradleVersion.version("8.3")) {
420420
if (project.name == "cli") {
421421
configure<PublishingExtension> {
422422
publications {
@@ -510,7 +510,7 @@ subprojects {
510510
// Can't use asFile (from https://docs.gradle.org/current/kotlin-dsl/gradle/org.gradle.api.resources/-text-resource/index.html )
511511
// as that creates and writes the File immediately ... which is then deleted
512512
// by Gradle clean. configProperties was only available from Spotless 7.0 (which requires Gradle >= 6.1.1)
513-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("${project.extra.get("gradleReleaseVersion")}")) {
513+
if (GradleVersion.current() >= GradleVersion.version("${project.extra.get("gradleReleaseVersion")}")) {
514514
removeUnusedImports()
515515
importOrder(resources.text.fromArchiveEntry(spotlessConfig, "java-import-order.txt").asString())
516516
val formatter = resources.text.fromArchiveEntry(spotlessConfig, "java-formatter.xml").asString()
@@ -527,7 +527,7 @@ subprojects {
527527
}
528528

529529
tasks.withType<JavaCompile>().configureEach {
530-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("${project.extra.get("gradleReleaseVersion")}")) {
530+
if (GradleVersion.current() >= GradleVersion.version("${project.extra.get("gradleReleaseVersion")}")) {
531531
dependsOn("spotlessApply")
532532
}
533533
}
@@ -626,7 +626,7 @@ fun loadSettings(extension: MavenSettingsPluginExtension, repository: String) {
626626

627627

628628
val isReleaseBuild = ("true" == gradle.startParameter.projectProperties.getOrDefault("release", ""))
629-
if (isReleaseBuild && org.gradle.util.GradleVersion.current().version != "${project.extra.get("gradleReleaseVersion")}") {
629+
if (isReleaseBuild && GradleVersion.current().version != "${project.extra.get("gradleReleaseVersion")}") {
630630
throw GradleException("Gradle ${project.extra.get("gradleReleaseVersion")} is required to release this project")
631631
} else if (isReleaseBuild) {
632632
logger.lifecycle ("Running as release build")
@@ -635,8 +635,8 @@ if (System.getProperty("release") != null) {
635635
throw GradleException("Pass release=true as a -P parameter")
636636
}
637637

638-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("8.3") &&
639-
org.gradle.util.GradleVersion.current() < org.gradle.util.GradleVersion.version("9.0.0")) {
638+
if (GradleVersion.current() >= GradleVersion.version("8.3") &&
639+
GradleVersion.current() < GradleVersion.version("9.0.0")) {
640640
// LinkageError: loader constraint violation from GMEFunctionalTest otherwise
641641
if (System.getProperty("gmeFunctionalTest") == null) {
642642
val mavenExtension =

‎cli/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ tasks.named("test") {
6969
dependsOn("shadowJar")
7070
}
7171

72-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("5.0")) {
72+
if (GradleVersion.current() >= GradleVersion.version("5.0")) {
7373
tasks.named("generateMetadataFileForShadowPublication") {
7474
dependsOn("jar")
7575
}

‎gradle/fix-build.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,21 @@ esac
3030
case "${VERSION}" in
3131
4.10*)
3232
echo "Modifying build for named tasks"
33-
find ../ -name 'build.gradle.kts' ! -path '*/functTest/*' -print0 | xargs -0 -t sed -i \
33+
find ../ -name 'build.gradle.kts' ! -path '*/functTest/*' -print0 | xargs -0 sed -i \
3434
-e 's|tasks.named[(]|tasks.getByName(|g;'
3535
;;
3636
*)
3737
echo "Not modifying build"
3838
;;
3939
esac
40+
41+
case "${VERSION}" in
42+
4.10*|5.*|6.*)
43+
echo "Modifying build for GradleVersion"
44+
find ../ -name 'build.gradle.kts' -print0 | xargs -0 sed -i \
45+
-e 's|GradleVersion|org.gradle.util.GradleVersion|g;'
46+
;;
47+
*)
48+
echo "Not modifying build"
49+
;;
50+
esac

‎manipulation/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group = "org.jboss.gm"
88
gradlePlugin {
99
// According to https://plugins.gradle.org/docs/publish-plugin the simplifications in plugin publishing requires
1010
// Gradle 7.6 or later. Therefore use reflection here.
11-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.6")) {
11+
if (GradleVersion.current() >= GradleVersion.version("7.6")) {
1212
var pluginPublishMethod = GradlePluginDevelopmentExtension::class.memberFunctions.find{it.name == "getWebsite"}
1313
@Suppress("UNCHECKED_CAST")
1414
var wProperty = pluginPublishMethod?.call(this) as Property<String>
@@ -26,7 +26,7 @@ gradlePlugin {
2626
implementationClass = "org.jboss.gm.manipulation.ManipulationPlugin"
2727
displayName = "GME Manipulation Plugin"
2828

29-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.6")) {
29+
if (GradleVersion.current() >= GradleVersion.version("7.6")) {
3030
var getTagsMethod = PluginDeclaration::class.memberFunctions.find { it.name == "getTags" }
3131
@Suppress("UNCHECKED_CAST")
3232
var sProperty = getTagsMethod?.call(this) as SetProperty<String>
@@ -74,7 +74,7 @@ dependencies {
7474
testImplementation(gradleTestKit())
7575
}
7676

77-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("9.0.0")) {
77+
if (GradleVersion.current() >= GradleVersion.version("9.0.0")) {
7878
// Include a fake Upload purely for compilation purposes.
7979
sourceSets.getByName ("main") {
8080
java.srcDir("src/gradle9/java")
@@ -104,7 +104,7 @@ idea.module {
104104
// testSources / testResources only available from 7.4 and greater so can't just do:
105105
// testSources.from(sourceSets["functionalTest"].java.srcDirs).
106106
// Not bothering to handle other versions as we're developing on later Gradle now.
107-
if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
107+
if (GradleVersion.current() >= GradleVersion.version("7.4")) {
108108
var rTestSources = IdeaModule::class.memberFunctions.find{it.name == "getTestSources"}
109109
var fileCollection = rTestSources?.call(this) as ConfigurableFileCollection
110110
fileCollection.from(sourceSets["functionalTest"].java.srcDirs)

0 commit comments

Comments
 (0)