Skip to content

Commit 227594e

Browse files
authored
Fix deprecated groovy space assignment (#47)
* Fix deprecated groovy space assignment For more information check the Gradle migration docs https://docs.gradle.org/current/userguide/upgrading_version_8.html#groovy_space_assignment_syntax This avoids warnings in the build of projects using this as an underlying plugin. ``` Space-assignment syntax in Groovy DSL has been deprecated. ```
1 parent 8953798 commit 227594e

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

.github/workflows/mps_cli_build.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: MPS-CLI_CI
22

3-
on:
3+
on:
44
push:
55
branches:
66
- 'main'
@@ -28,30 +28,30 @@ jobs:
2828
- name: Set up JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 11
31+
java-version: 11
3232
- name: Build MPS-CLI and Test
3333
uses: gradle/gradle-build-action@v2
34-
with:
34+
with:
3535
arguments: :plugin:functionalTest --debug
3636
wrapper-cache-enabled: true
3737
dependencies-cache-enabled: true
3838
dependencies-cache-key: gradle/dependency-locks/**
3939
dependencies-cache-exact: true
4040
configuration-cache-enabled: true
4141
build-root-directory: mps-cli-gradle-plugin
42-
- uses: actions/upload-artifact@v3
42+
- uses: actions/upload-artifact@v4
4343
if: failure()
4444
with:
4545
name: gradle-test-report
4646
path: ./mps-cli-gradle-plugin/plugin/build/reports/
4747
- name: Publish
4848
uses: gradle/gradle-build-action@v2
4949
if: github.event_name == 'push' && github.ref_name == 'main'
50-
with:
50+
with:
5151
arguments: :plugin:publish -Pgpr.user=${{github.actor}} -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
5252
wrapper-cache-enabled: true
5353
dependencies-cache-enabled: true
5454
dependencies-cache-key: gradle/dependency-locks/**
5555
dependencies-cache-exact: true
5656
configuration-cache-enabled: true
57-
build-root-directory: mps-cli-gradle-plugin
57+
build-root-directory: mps-cli-gradle-plugin

mps-cli-gradle-plugin/plugin/build.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020

2121
// Project versions
2222
ext.major = '0'
23-
ext.minor = '17'
23+
ext.minor = '18'
2424

2525
sourceCompatibility = 1.8
2626
targetCompatibility = 1.8
@@ -97,23 +97,23 @@ application {
9797
publishing {
9898
repositories {
9999
maven {
100-
name = "GitHubPackages"
101-
url = uri("https://maven.pkg.github.com/mbeddr/mps-cli")
102-
if(project.hasProperty("gpr.token")) {
103-
credentials {
104-
username = project.findProperty("gpr.user")
105-
password = project.findProperty("gpr.token")
106-
}
107-
}
108-
}
100+
name = "GitHubPackages"
101+
url = uri("https://maven.pkg.github.com/mbeddr/mps-cli")
102+
if (project.hasProperty("gpr.token")) {
103+
credentials {
104+
username = project.findProperty("gpr.user")
105+
password = project.findProperty("gpr.token")
106+
}
107+
}
108+
}
109109
}
110110

111111
publications {
112112
maven(MavenPublication) {
113113
groupId = 'com.mbeddr.mps_cli'
114114
artifactId = 'gradle.plugin'
115-
115+
116116
from components.java
117117
}
118118
}
119-
}
119+
}

mps-cli-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ConeOfInfluenceComputerTask.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class ConeOfInfluenceComputerTask extends DefaultTask {
3939
List<SModuleBase> affectedSolutionsAndUpstreamDependencies
4040

4141
ConeOfInfluenceComputerTask() {
42-
group "MPS-CLI"
43-
description "computes the solutions potentially affected (and their dependencies) of the changes from current branch compared to 'referenceBranchName' from the 'gitRootRepoLocation'"
42+
group = "MPS-CLI"
43+
description = "computes the solutions potentially affected (and their dependencies) of the changes from current branch compared to 'referenceBranchName' from the 'gitRootRepoLocation'"
4444
}
4545

4646
@TaskAction

mps-cli-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModelBuilderTask.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class ModelBuilderTask extends DefaultTask {
1616
SRepository repository;
1717

1818
ModelBuilderTask() {
19-
group("MPS-CLI")
20-
description("build the object model based on MPS files from 'sourceDir'")
19+
group = "MPS-CLI"
20+
description = "build the object model based on MPS files from 'sourceDir'"
2121
}
2222

2323
@TaskAction

mps-cli-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModelDependenciesBuilderTask.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class ModelDependenciesBuilderTask extends DefaultTask {
2121
Map<SModel, Set<SModel>> model2AllDownstreamDependencies = [:];
2222

2323
ModelDependenciesBuilderTask() {
24-
group("MPS-CLI")
25-
description("build the upstream/downstream dependencies for all models based on MPS files from 'sourceDir' list")
24+
group = "MPS-CLI"
25+
description = "build the upstream/downstream dependencies for all models based on MPS files from 'sourceDir' list"
2626
}
2727

2828
@TaskAction
@@ -33,4 +33,4 @@ class ModelDependenciesBuilderTask extends DefaultTask {
3333
(model2AllUpstreamDependencies, model2AllDownstreamDependencies) =
3434
EntityDependenciesBuilder.buildModelDependencies(repository)
3535
}
36-
}
36+
}

mps-cli-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModuleDependenciesBuilderTask.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class ModuleDependenciesBuilderTask extends DefaultTask {
2121
Map<SModuleBase, Set<SModuleBase>> module2AllDownstreamDependencies = [:];
2222

2323
ModuleDependenciesBuilderTask() {
24-
group("MPS-CLI")
25-
description("build the upstream/downstream dependencies for all modules based on MPS files from 'sourceDir' list")
24+
group = "MPS-CLI"
25+
description = "build the upstream/downstream dependencies for all modules based on MPS files from 'sourceDir' list"
2626
}
2727

2828
@TaskAction
@@ -33,4 +33,4 @@ class ModuleDependenciesBuilderTask extends DefaultTask {
3333
(module2AllUpstreamDependencies, module2AllDownstreamDependencies) =
3434
EntityDependenciesBuilder.buildModuleDependencies(repository)
3535
}
36-
}
36+
}

mps-cli-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/PrintLanguageInfoTask.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class PrintLanguageInfoTask extends DefaultTask {
1212
String destinationDir;
1313

1414
PrintLanguageInfoTask() {
15-
group "MPS-CLI"
16-
description "print information about the DSLs"
15+
group = "MPS-CLI"
16+
description = "print information about the DSLs"
1717
dependsOn "buildModel"
1818
}
1919

0 commit comments

Comments
 (0)