Skip to content

Commit 8887319

Browse files
authored
Merge pull request #48484 from cwansart/gradle_space_assignment2
Fix group and version space assignment in Gradle
2 parents c4a6964 + a9c6562 commit 8887319

File tree

95 files changed

+198
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+198
-198
lines changed

devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,9 @@ String validateBasicGradleGroovyIdentifiers(Path project, String group, String a
444444
"build.gradle should exist: " + buildGradle.toAbsolutePath().toString());
445445

446446
String buildContent = CliDriver.readFileAsString(buildGradle);
447-
Assertions.assertTrue(buildContent.contains("group '" + group + "'"),
447+
Assertions.assertTrue(buildContent.contains("group = '" + group + "'"),
448448
"build.gradle should include the group id:\n" + buildContent);
449-
Assertions.assertTrue(buildContent.contains("version '" + version + "'"),
449+
Assertions.assertTrue(buildContent.contains("version = '" + version + "'"),
450450
"build.gradle should include the version:\n" + buildContent);
451451

452452
Path settings = project.resolve("settings.gradle");

devtools/gradle/gradle-extension-plugin/src/test/java/io/quarkus/extension/gradle/TestUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public static String getDefaultGradleBuildFileContent(boolean disableValidation,
3636
"id 'java'\n" +
3737
"id 'io.quarkus.extension'\n" +
3838
"}\n" +
39-
"group 'org.acme'\n" +
40-
"version '1.0.0'\n" +
39+
"group = 'org.acme'\n" +
40+
"version = '1.0.0'\n" +
4141
"repositories { \n" +
4242
"mavenCentral()\n" +
4343
"mavenLocal()\n" +
@@ -63,8 +63,8 @@ public static String getDefaultDeploymentBuildFileContent(List<String> implement
6363
return "plugins {\n" +
6464
"id 'java'\n" +
6565
"}\n" +
66-
"group 'org.acme'\n" +
67-
"version '1.0.0'\n" +
66+
"group = 'org.acme'\n" +
67+
"version = '1.0.0'\n" +
6868
"repositories { \n" +
6969
"mavenCentral()\n" +
7070
"mavenLocal()\n" +

extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies {
1616
testImplementation 'io.rest-assured:rest-assured'
1717
}
1818

19-
group '${groupId}'
20-
version '${version}'
19+
group = '${groupId}'
20+
version = '${version}'
2121

2222
compileJava {
2323
options.compilerArgs << '-parameters'

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ dependencies {
4040
{/}
4141

4242
{#insert project}
43-
group '{project.group-id}'
44-
version '{project.version}'
43+
group = '{project.group-id}'
44+
version = '{project.version}'
4545
{/}
4646

4747
{#insert java}

independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ private void checkGradle(Path projectDir) {
398398
assertThat(projectDir.resolve("settings.gradle.kts")).doesNotExist();
399399
assertThat(projectDir.resolve("build.gradle"))
400400
.exists()
401-
.satisfies(checkContains("group 'org.test'"))
402-
.satisfies(checkContains("version '1.0.0-codestart'"));
401+
.satisfies(checkContains("group = 'org.test'"))
402+
.satisfies(checkContains("version = '1.0.0-codestart'"));
403403
assertThat(projectDir.resolve("gradle.properties")).exists();
404404
assertThat(projectDir.resolve("settings.gradle"))
405405
.exists()

integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ public void createGradle() throws Exception {
185185
.satisfies(checkContains("@Path(\"/foo\")"));
186186
assertThat(projectDir.resolve("build.gradle"))
187187
.exists()
188-
.satisfies(checkContains("group 'io.foo'"))
189-
.satisfies(checkContains("version '1.0.0-FOO'"))
188+
.satisfies(checkContains("group = 'io.foo'"))
189+
.satisfies(checkContains("version = '1.0.0-FOO'"))
190190
.satisfies(checkContains("implementation 'io.quarkus:quarkus-resteasy'"));
191191

192192
assertThat(projectDir.resolve("settings.gradle"))

integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleContent/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dependencies {
2121
testImplementation 'io.rest-assured:rest-assured'
2222
}
2323

24-
group 'org.test'
25-
version '1.0.0-codestart'
24+
group = 'org.test'
25+
version = '1.0.0-codestart'
2626

2727
java {
2828
sourceCompatibility = JavaVersion.VERSION_17

integration-tests/gradle/src/main/resources/add-remove-extension-single-module/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dependencies {
2121
testImplementation 'io.rest-assured:rest-assured'
2222
}
2323

24-
group 'org.acme'
25-
version '1.0.0-SNAPSHOT'
24+
group = 'org.acme'
25+
version = '1.0.0-SNAPSHOT'
2626

2727
compileJava {
2828
options.encoding = 'UTF-8'

integration-tests/gradle/src/main/resources/avro-simple-project/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ dependencies {
2020
implementation 'io.quarkus:quarkus-avro'
2121
}
2222

23-
group 'org.acme'
24-
version '1.0.0-SNAPSHOT'
23+
group = 'org.acme'
24+
version = '1.0.0-SNAPSHOT'
2525

2626
test {
2727
systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"

integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/application/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins{
55

66

77

8-
group 'io.quarkus.test.application'
9-
version '1.0-SNAPSHOT'
8+
group = 'io.quarkus.test.application'
9+
version = '1.0-SNAPSHOT'
1010

1111

1212
repositories {

0 commit comments

Comments
 (0)