Skip to content

Commit

Permalink
Fix deprecated groovy space assignment (#47)
Browse files Browse the repository at this point in the history
* 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.
```
  • Loading branch information
wjglerum authored Jan 31, 2025
1 parent 8953798 commit 227594e
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/mps_cli_build.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MPS-CLI_CI

on:
on:
push:
branches:
- 'main'
Expand Down Expand Up @@ -28,30 +28,30 @@ jobs:
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 11
- name: Build MPS-CLI and Test
uses: gradle/gradle-build-action@v2
with:
with:
arguments: :plugin:functionalTest --debug
wrapper-cache-enabled: true
dependencies-cache-enabled: true
dependencies-cache-key: gradle/dependency-locks/**
dependencies-cache-exact: true
configuration-cache-enabled: true
build-root-directory: mps-cli-gradle-plugin
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: gradle-test-report
path: ./mps-cli-gradle-plugin/plugin/build/reports/
- name: Publish
uses: gradle/gradle-build-action@v2
if: github.event_name == 'push' && github.ref_name == 'main'
with:
with:
arguments: :plugin:publish -Pgpr.user=${{github.actor}} -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
wrapper-cache-enabled: true
dependencies-cache-enabled: true
dependencies-cache-key: gradle/dependency-locks/**
dependencies-cache-exact: true
configuration-cache-enabled: true
build-root-directory: mps-cli-gradle-plugin
build-root-directory: mps-cli-gradle-plugin
24 changes: 12 additions & 12 deletions mps-cli-gradle-plugin/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {

// Project versions
ext.major = '0'
ext.minor = '17'
ext.minor = '18'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down Expand Up @@ -97,23 +97,23 @@ application {
publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/mbeddr/mps-cli")
if(project.hasProperty("gpr.token")) {
credentials {
username = project.findProperty("gpr.user")
password = project.findProperty("gpr.token")
}
}
}
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/mbeddr/mps-cli")
if (project.hasProperty("gpr.token")) {
credentials {
username = project.findProperty("gpr.user")
password = project.findProperty("gpr.token")
}
}
}
}

publications {
maven(MavenPublication) {
groupId = 'com.mbeddr.mps_cli'
artifactId = 'gradle.plugin'

from components.java
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class ConeOfInfluenceComputerTask extends DefaultTask {
List<SModuleBase> affectedSolutionsAndUpstreamDependencies

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

@TaskAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class ModelBuilderTask extends DefaultTask {
SRepository repository;

ModelBuilderTask() {
group("MPS-CLI")
description("build the object model based on MPS files from 'sourceDir'")
group = "MPS-CLI"
description = "build the object model based on MPS files from 'sourceDir'"
}

@TaskAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class ModelDependenciesBuilderTask extends DefaultTask {
Map<SModel, Set<SModel>> model2AllDownstreamDependencies = [:];

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

@TaskAction
Expand All @@ -33,4 +33,4 @@ class ModelDependenciesBuilderTask extends DefaultTask {
(model2AllUpstreamDependencies, model2AllDownstreamDependencies) =
EntityDependenciesBuilder.buildModelDependencies(repository)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class ModuleDependenciesBuilderTask extends DefaultTask {
Map<SModuleBase, Set<SModuleBase>> module2AllDownstreamDependencies = [:];

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

@TaskAction
Expand All @@ -33,4 +33,4 @@ class ModuleDependenciesBuilderTask extends DefaultTask {
(module2AllUpstreamDependencies, module2AllDownstreamDependencies) =
EntityDependenciesBuilder.buildModuleDependencies(repository)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class PrintLanguageInfoTask extends DefaultTask {
String destinationDir;

PrintLanguageInfoTask() {
group "MPS-CLI"
description "print information about the DSLs"
group = "MPS-CLI"
description = "print information about the DSLs"
dependsOn "buildModel"
}

Expand Down

0 comments on commit 227594e

Please sign in to comment.