Skip to content

Commit 27d0d8e

Browse files
1.26.0: upgrade to Gradle 8.8
1 parent a1000fe commit 27d0d8e

File tree

18 files changed

+145
-118
lines changed

18 files changed

+145
-118
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
33
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
44

5+
## 1.26.0
6+
7+
### Changed
8+
9+
- Upgraded to Gradle 8.8. The plugin may not work with earlier Gradle versions.
10+
511
## 1.25.2
612

713
### Fixed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ plugins {
2929
}
3030
```
3131

32-
Use a fully specified version such as `1.0.123` or Gradle dependency locking for better build reproducibility.
32+
Use a more precisely specified version such as `1.26.0.+` or Gradle dependency locking for better build
33+
reproducibility.
3334

3435
## Reference
3536

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
2525
}
2626

27-
val baseVersion = "1.25.2"
27+
val baseVersion = "1.26.0"
2828

2929
group = "de.itemis.mps"
3030

buildscript-gradle.lockfile

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,37 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.github.gundy:semver4j:0.16.4=classpath
5-
com.google.code.findbugs:jsr305:3.0.2=classpath
6-
com.google.code.gson:gson:2.8.9=classpath
7-
com.google.errorprone:error_prone_annotations:2.3.4=classpath
8-
com.google.guava:failureaccess:1.0.1=classpath
9-
com.google.guava:guava:29.0-jre=classpath
10-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
11-
com.google.j2objc:j2objc-annotations:1.3=classpath
124
com.googlecode.java-diff-utils:diffutils:1.3.0=classpath
13-
de.undercouch:gradle-download-task:4.1.1=classpath
14-
net.java.dev.jna:jna:5.6.0=classpath
15-
org.checkerframework:checker-qual:2.11.1=classpath
16-
org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:2.4.1=classpath
17-
org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath
5+
org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.3.1=classpath
6+
org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.3.1=classpath
187
org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
198
org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.10=classpath
20-
org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath
21-
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath
22-
org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath
23-
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath
24-
org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath
25-
org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath
26-
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath
27-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath
28-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath
29-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath
30-
org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
31-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
32-
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
33-
org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
34-
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=classpath
35-
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
36-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
37-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
38-
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
39-
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
40-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
41-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
42-
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
43-
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
44-
org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
45-
org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
46-
org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath
9+
org.jetbrains.kotlin:kotlin-android-extensions:1.9.22=classpath
10+
org.jetbrains.kotlin:kotlin-assignment:1.9.22=classpath
11+
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=classpath
12+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=classpath
13+
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=classpath
14+
org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=classpath
15+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=classpath
16+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.22=classpath
17+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.22=classpath
18+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.22=classpath
19+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.22=classpath
20+
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.22=classpath
21+
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22=classpath
22+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.22=classpath
23+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.22=classpath
24+
org.jetbrains.kotlin:kotlin-native-utils:1.9.22=classpath
25+
org.jetbrains.kotlin:kotlin-project-model:1.9.22=classpath
26+
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.22=classpath
27+
org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=classpath
28+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=classpath
29+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=classpath
30+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=classpath
31+
org.jetbrains.kotlin:kotlin-stdlib:1.9.22=classpath
32+
org.jetbrains.kotlin:kotlin-tooling-core:1.9.22=classpath
33+
org.jetbrains.kotlin:kotlin-util-io:1.9.22=classpath
34+
org.jetbrains.kotlin:kotlin-util-klib:1.9.22=classpath
4735
org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.13.2=classpath
4836
org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2=classpath
4937
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath

gradle.lockfile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
de.itemis.mps.build-backends:launcher:2.3.0.91.50c4cb7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4+
de.itemis.mps.build-backends:launcher:2.3.0.94.09f8f72=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55
junit:junit:4.13.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6-
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
76
net.swiftzer.semver:semver:1.1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
87
org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9-
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
10-
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
11-
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
12-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
13-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
14-
org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.7.10=kotlinKlibCommonizerClasspath
15-
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
16-
org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
17-
org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
18-
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
19-
org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
20-
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
21-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
22-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
23-
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
24-
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
25-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
26-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
27-
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
28-
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
29-
org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
30-
org.jetbrains:annotations:13.0=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8+
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
9+
org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
10+
org.jetbrains.kotlin:kotlin-build-common:1.9.22=kotlinBuildToolsApiClasspath
11+
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=kotlinBuildToolsApiClasspath
12+
org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.22=kotlinBuildToolsApiClasspath
13+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
14+
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=kotlinBuildToolsApiClasspath
15+
org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=kotlinBuildToolsApiClasspath
16+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
17+
org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.22=kotlinKlibCommonizerClasspath
18+
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
19+
org.jetbrains.kotlin:kotlin-reflect:1.9.22=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
20+
org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
21+
org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
22+
org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
23+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
24+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
25+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
26+
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=implementationDependenciesMetadata,runtimeClasspath
27+
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=implementationDependenciesMetadata,runtimeClasspath
28+
org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,compileOnlyDependenciesMetadata,embeddedKotlin,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
29+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath
30+
org.jetbrains:annotations:13.0=compileClasspath,embeddedKotlin,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3131
empty=annotationProcessor,apiDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,mps,runtimeOnlyDependenciesMetadata,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntimeOnlyDependenciesMetadata

gradle/wrapper/gradle-wrapper.jar

-17.7 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

200-
# Collect all arguments for the java command;
201-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202-
# shell script including quotes and variable substitutions, so put them in
203-
# double quotes to make sure that they get re-expanded; and
204-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
205210

206211
set -- \
207212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pluginManagement {
33
}
44

55
plugins {
6-
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.7.0")
6+
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
77
}
88

99
rootProject.name = "mps-gradle-plugin"

src/main/kotlin/de/itemis/mps/gradle/RunAntScript.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ open class RunAntScript : DefaultTask() {
6161
}
6262

6363
if(logging.level != null && logging.level != LogLevel.LIFECYCLE && !allArgs.any { it.startsWith("-Dmps.ant.log=") }) {
64-
allArgs += "-Dmps.ant.log=${logging.level.toString().toLowerCase(Locale.ENGLISH)}"
64+
allArgs += "-Dmps.ant.log=${logging.level.toString().lowercase()}"
6565
}
6666

6767
if (incremental) {

src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ open class DownloadJbrProjectPlugin : Plugin<Project> {
6464
into(extension.downloadDirProperty)
6565
includeEmptyDirs = false
6666
eachFile {
67-
mode = mode or Integer.parseInt("600", 8)
67+
permissions { user { write = true } }
6868
}
6969
filesMatching("jbr_*/**") {
7070
path = path.replace("jbr_(.*?)/(.*)".toRegex(), "jbr/$2")

0 commit comments

Comments
 (0)