From 71530d743c15a34979284b1e42d3cbe5f6c383c6 Mon Sep 17 00:00:00 2001 From: Dierk Koenig Date: Sun, 28 Jun 2020 15:37:48 +0200 Subject: upgrading to gradle 6.5 --- build.gradle | 48 +++++-------------- gradle/integTest.gradle | 5 +- gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 6 +-- gradlew | 53 +++++++++++++-------- gradlew.bat | 22 ++++++++- .../groovy/frege/gradle/tasks/FregeCompile.groovy | 2 +- 7 files changed, 73 insertions(+), 63 deletions(-) diff --git a/build.gradle b/build.gradle index 8d58aea..d3dd514 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ apply plugin: "groovy" -apply plugin: "maven" +apply plugin: "maven-publish" // I don't think we need this at all apply plugin: "signing" apply plugin: "idea" @@ -19,35 +19,11 @@ ext { fregeBaseVersion = "3.25.84" fregeClassifier = "" - fregeVersion = "$fregeBaseVersion$fregeClassifier" - - // work around https://issues.gradle.org/browse/GRADLE-3281 - // fixed in 0.9.3 https://plugins.gradle.org/plugin/com.gradle.plugin-publish -// def home = new File(System.getProperty("user.home")) -// def propfile = new File(home, ".gradle/gradle.properties") -// if (propfile.exists()) { -// props = new Properties() -// propfile.withReader { -// props.load(it) -// def keyName = "gradle.publish.key" -// def key = props.getProperty(keyName) -// if (key == null) { -// println "No key named $keyName found in ${propfile.absolutePath}" -// } -// def secretName = "gradle.publish.secret" -// def secret = props.getProperty(secretName) -// if (secret == null) { -// println "No key named $secretName found in ${propfile.absolutePath}" -// } -// if (key != null && secret != null) { -// System.setProperty "gradle.publish.key", props.'gradle.publish.key' -// System.setProperty "gradle.publish.secret", props.'gradle.publish.secret' -// } -// } -// } else println "cannot find '$propfile.absolutePath'" + fregeVersion = fregeBaseVersion + fregeClassifier + } -apply from: "gradle/sonatype.gradle" +// apply from: "gradle/sonatype.gradle" // not sure why that is here version = projectVersion group = projectGroup @@ -62,16 +38,16 @@ repositories { } dependencies { - compile "$projectGroup:frege:$fregeVersion" - compile "$projectGroup:frege-repl-core:1.2" - compile "$projectGroup:frege-native-gen:1.3" - compile "org.functionaljava:functionaljava:4.4" + implementation "$projectGroup:frege:$fregeVersion" + // api "$projectGroup:frege-repl-core:1.2" // this now comes with the frege distro + implementation "$projectGroup:frege-native-gen:1.3" + // api "org.functionaljava:functionaljava:4.4" // try without - compile gradleApi() - compile localGroovy() - testCompile gradleTestKit() + implementation gradleApi() + implementation localGroovy() + testImplementation gradleTestKit() - testCompile('org.spockframework:spock-core:1.0-groovy-2.4') { + testImplementation('org.spockframework:spock-core:1.0-groovy-2.4') { exclude module: 'groovy-all' } } diff --git a/gradle/integTest.gradle b/gradle/integTest.gradle index b1baf13..2ce286c 100644 --- a/gradle/integTest.gradle +++ b/gradle/integTest.gradle @@ -43,5 +43,6 @@ task createClasspathManifest { } dependencies { - integTestRuntime files(createClasspathManifest) -} \ No newline at end of file + testRuntimeOnly files(createClasspathManifest) + // integTestRuntime files(createClasspathManifest) // old +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..62d4c05 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d07a839..9995423 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 04 17:17:55 CEST 2019 +#Tue Jun 23 13:39:19 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index cccdd3d..fbd7c51 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..a9f778a 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy b/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy index ffd6aa3..d619158 100644 --- a/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy +++ b/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy @@ -115,7 +115,7 @@ class FregeCompile extends AbstractCompile { List sourcePaths = [] - @Override + // @Override // spurious compile error @TaskAction protected void compile() { def jvmArgumentsToUse = allJvmArgs.empty ? ["-Xss$stackSize"] : new ArrayList(allJvmArgs) -- cgit