From d15172d41abba22ff0f55b51c08bbdd170f19478 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Sat, 25 Jun 2022 12:37:24 +0800 Subject: [PATCH] switch to lys-dependencies --- antlr/build.gradle | 12 +- benchmark/build.gradle | 8 +- build.gradle | 39 ++-- gradle.properties | 26 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 269 ++++++++++++++--------- settings.gradle | 17 +- wson-cli/build.gradle | 6 +- 8 files changed, 214 insertions(+), 165 deletions(-) diff --git a/antlr/build.gradle b/antlr/build.gradle index 5cc4a3d..c925999 100644 --- a/antlr/build.gradle +++ b/antlr/build.gradle @@ -5,12 +5,14 @@ plugins { dependencies { implementation rootProject - testImplementation group: "net.woggioni", name: "jwo", version: getProperty('version.jwo') + testImplementation group: "net.woggioni", name: "jwo" testImplementation project(':test-utils') - testImplementation group: "com.fasterxml.jackson.core", name:"jackson-databind", version: getProperty('version.jackson') - testImplementation group: "org.tukaani", name: "xz", version: getProperty('version.xz') - antlr group: "org.antlr", name: "antlr4", version: getProperty('version.antlr') - antlr group: "org.antlr", name: "antlr4-runtime", version: getProperty('version.antlr') + testImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind" + testImplementation group: "org.tukaani", name: "xz" + + antlr platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) + antlr group: "org.antlr", name: "antlr4" + antlr group: "org.antlr", name: "antlr4-runtime" } generateGrammarSource { diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 8970f02..8c8acf0 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -14,10 +14,10 @@ run { dependencies { implementation rootProject implementation project(':antlr') - implementation group: "net.woggioni", name: "jwo", version: getProperty('version.jwo') - implementation group: 'org.tukaani', name: 'xz', version: getProperty('version.xz') - implementation group: 'com.beust', name: 'jcommander', version: getProperty('version.jcommander') - implementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: getProperty('version.jackson') + implementation group: "net.woggioni", name: "jwo" + implementation group: 'org.tukaani', name: 'xz' + implementation group: 'com.beust', name: 'jcommander' + implementation group: "com.fasterxml.jackson.core", name: "jackson-databind" runtimeOnly project(':test-utils') } diff --git a/build.gradle b/build.gradle index 4d2b27d..bb952a6 100644 --- a/build.gradle +++ b/build.gradle @@ -9,31 +9,30 @@ allprojects { apply plugin: 'net.woggioni.gradle.lombok' group = "net.woggioni" - version = getProperty('version.wson') + version = getProperty('wson.version') lombok { - version = getProperty('version.lombok') + version = getProperty('lombok.version') } repositories { maven { url = "https://woggioni.net/mvn/" + content { + includeGroup 'net.woggioni' + includeGroup 'com.lys' + } } mavenCentral() } dependencies { - ['', 'test'].each {sourceSetName -> - ['compileOnly', 'annotationProcessor'].each { configurationSuffix -> - String configurationName - if(sourceSetName) configurationName = sourceSetName + configurationSuffix.capitalize() - else configurationName = configurationSuffix - add(configurationName, [group: "org.projectlombok", name: "lombok", version: getProperty('version.lombok')]) - } - } - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('version.junit.jupiter') - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: getProperty('version.junit.jupiter') - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('version.junit.jupiter') + implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) + implementation group: "org.tukaani", name: "xz" + + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine' } test { @@ -41,18 +40,12 @@ allprojects { } } -subprojects { - tasks.named('jar', Jar) { - archiveBaseName = "wson-${project.name}" - } -} - dependencies { - implementation group: "net.woggioni", name: "jwo", version: getProperty('version.jwo') - implementation group: "org.slf4j", name: "slf4j-api", version: getProperty('version.slf4j') + implementation group: "net.woggioni", name: "jwo" + implementation group: "org.slf4j", name: "slf4j-api" testImplementation project('test-utils') - testImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: getProperty('version.jackson') + testImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind" } java { @@ -67,7 +60,7 @@ compileJava { wrapper { distributionType = Wrapper.DistributionType.BIN - gradleVersion = getProperty("version.gradle") + gradleVersion = getProperty("gradle.version") } diff --git a/gradle.properties b/gradle.properties index 872ddad..f157ff3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ -version.gradle=7.3.3 -version.wson = 1.0 -version.jwo = 1.0 -version.junit.jupiter = 5.7.0 -version.lombok = 1.18.22 -version.slf4j = 1.7.32 -version.jackson = 2.13.1 -version.jcommander = 1.82 -version.antlr = 4.9.3 -version.xz = 1.9 -version.kotlin=1.6.10 -version.multiReleaseJarPlugin=0.1 +gradle.version=7.4.2 +wson.version = 1.0-SNAPSHOT + +net.woggioni.gradle.lombok.version = 0.1 +net.woggioni.gradle.envelope.version = 1.0-SNAPSHOT +net.woggioni.gradle.multi-release-jar = 0.1 + +lys.version = 0.1-SNAPSHOT + +lombok.version = 1.18.22 +kotlin.version = 1.7.0 + +jpms.module.name = net.woggioni.wson -jpms.module.name=net.woggioni.wson diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# 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 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - 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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/settings.gradle b/settings.gradle index 2c122a7..4c60edf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,17 +1,22 @@ pluginManagement { repositories { - mavenLocal() - gradlePluginPortal() maven { url = 'https://woggioni.net/mvn/' + content { + includeGroup 'net.woggioni.gradle' + includeGroup 'net.woggioni.gradle.lombok' + includeGroup 'net.woggioni.gradle.envelope' + includeGroup 'net.woggioni.gradle.multi-release-jar' + } } + gradlePluginPortal() } plugins { - id 'net.woggioni.gradle.envelope' version "0.1" - id 'net.woggioni.gradle.lombok' version "0.1" - id 'net.woggioni.gradle.multi-release-jar' version getProperty('version.multiReleaseJarPlugin') - id 'org.jetbrains.kotlin.jvm' version getProperty('version.kotlin') + id 'net.woggioni.gradle.envelope' version getProperty('net.woggioni.gradle.envelope.version') + id 'net.woggioni.gradle.lombok' version getProperty('net.woggioni.gradle.lombok.version') + id 'net.woggioni.gradle.multi-release-jar' version getProperty('net.woggioni.gradle.multi-release-jar') + id 'org.jetbrains.kotlin.jvm' version getProperty('kotlin.version') } } diff --git a/wson-cli/build.gradle b/wson-cli/build.gradle index 2733c97..1f62ddf 100644 --- a/wson-cli/build.gradle +++ b/wson-cli/build.gradle @@ -5,9 +5,9 @@ plugins { } dependencies { - implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: getProperty('version.kotlin') - implementation group: 'com.beust', name: 'jcommander', version: getProperty('version.jcommander') - implementation group: "org.slf4j", name: "slf4j-simple", version: getProperty('version.slf4j') + implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: getProperty('kotlin.version') + implementation group: 'com.beust', name: 'jcommander' + implementation group: "org.slf4j", name: "slf4j-simple" implementation rootProject }