diff --git a/.ado/build.yml b/.ado/build.yml
deleted file mode 100644
index eb85d47..0000000
--- a/.ado/build.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: $(Rev:r)
-
-trigger:
- branches:
- include:
- - '*'
- exclude:
- - master
-
-pr:
- branches:
- include:
- - '*'
-
-jobs:
-- job: 'Build'
- displayName: 'Build for testing'
-
- pool: 'MC-Build-1ES-Azure-Pipeline-Linux'
- container: adoptopenjdk/openjdk8:latest
-
- workspace:
- clean: all
-
- steps:
- - task: Gradle@2
- displayName: Build and Test
- inputs:
- workingDirectory: ''
- gradleWrapperFile: 'gradlew'
- gradleOptions: '-Xmx3072m'
- options: '-PbuildNumber=0'
- javaHomeOption: 'JDKVersion'
- jdkUserInputPath: '/usr/java/openjdk-8'
- testResultsFiles: '**/TEST-*.xml'
- tasks: 'build test publish'
-
- # This is a workaround for ComponentGovernanceComponentDetection@0 not recognizing the generated `.pom` file(s)
- - task: Bash@3
- displayName: Copy pom for component governance
- inputs:
- targetType: 'inline'
- script: |
- pompath=`find build/repo -name *.pom`
- cp "${pompath}" build/pom.xml
-
- - task: ComponentGovernanceComponentDetection@0
- inputs:
- scanType: 'Register'
- verbosity: 'Verbose'
- alertWarningLevel: 'High'
diff --git a/.ado/release.yml b/.ado/release.yml
deleted file mode 100644
index b4c334a..0000000
--- a/.ado/release.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-name: $(Rev:r)
-
-trigger:
- branches:
- include:
- - master
-
-pr: none
-
-variables:
- rConnection: 'mc-java-sc'
- storageAccount: 'librariesminecraftnet'
- storageAccountContainer: 'librariesminecraftnet'
- keyVault: 'mc-java-vault'
-
-jobs:
-- job: 'Build'
- displayName: 'Build for release'
-
- pool: 'MC-Build-1ES-Azure-Pipeline-Linux'
- container: adoptopenjdk/openjdk8:latest
-
- workspace:
- clean: all
-
- steps:
- - task: Gradle@2
- displayName: Build and Test
- inputs:
- workingDirectory: ''
- gradleWrapperFile: 'gradlew'
- gradleOptions: '-Xmx3072m'
- options: '-PbuildNumber=$(Build.BuildNumber)'
- javaHomeOption: 'JDKVersion'
- jdkUserInputPath: '/usr/java/openjdk-8'
- testResultsFiles: '**/TEST-*.xml'
- tasks: 'build test publish report'
-
- # This is a workaround for ComponentGovernanceComponentDetection@0 not recognizing the generated `.pom` file(s)
- - task: Bash@3
- displayName: Copy pom for component governance
- inputs:
- targetType: 'inline'
- script: |
- pompath=`find build/repo -name *.pom`
- cp "${pompath}" build/pom.xml
-
- - task: ComponentGovernanceComponentDetection@0
- inputs:
- scanType: 'Register'
- verbosity: 'Verbose'
- alertWarningLevel: 'High'
-
- - publish: 'build/repo/'
- artifact: repo
-
-- job: 'Publish'
- displayName: 'Publish release'
- dependsOn: Build
- condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
-
- pool: 'MC-Build-1ES-Azure-Pipeline-Linux'
-
- workspace:
- clean: all
-
- steps:
- - download: current
- artifact: repo
-
- - task: AzureKeyVault@1
- displayName: 'Fetching secrets'
- name: secrets
- inputs:
- azureSubscription: '$(rConnection)'
- KeyVaultName: '$(keyVault)'
- SecretsFilter: 'access-key-prod-librariesminecraftnet'
- RunAsPreJob: false
-
- - task: AzureCLI@2
- displayName: Azure CLI
- inputs:
- azureSubscription: '$(rConnection)'
- scriptType: 'bash'
- scriptLocation: 'inlineScript'
- inlineScript: |
- az storage blob upload-batch -s '$(Pipeline.Workspace)/repo' -d $(storageAccountContainer) --account-name $(storageAccount) --account-key $(access-key-prod-librariesminecraftnet)
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
deleted file mode 100644
index de2dee6..0000000
--- a/.github/workflows/pr-check.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: pr-check
-
-on: [ pull_request ]
-
-jobs:
- build:
- name: Build and test
- runs-on: ubuntu-latest
- container:
- image: adoptopenjdk/openjdk8:latest
-
- steps:
- - uses: actions/checkout@v3
- - name: Build with Gradle
- uses: gradle/gradle-build-action@v2
- with:
- arguments: build test
- - name: Publish Test Report
- uses: mikepenz/action-junit-report@v3
- if: always()
- with:
- report_paths: '**/build/test-results/test/TEST-*.xml'
diff --git a/README.md b/README.md
index 077684d..cd68276 100644
--- a/README.md
+++ b/README.md
@@ -9,44 +9,34 @@ Brigadier is available to Maven & Gradle via `libraries.minecraft.net`. Its grou
First include our repository:
```groovy
maven {
- url "https://libraries.minecraft.net"
+ url "https://maven.fortern.xyz/repository/maven-public/"
}
```
And then use this library (change `(the latest version)` to the latest version!):
```groovy
-compile 'com.mojang:brigadier:(the latest version)'
+compile 'xyz.fortern:brigadier:(the latest version)'
```
## Maven
-First include our repository:
+First include my repository:
```xml
- minecraft-libraries
- Minecraft Libraries
- https://libraries.minecraft.net
+ fortern-libraries
+ Fortern Libraries
+ https://maven.fortern.xyz/repository/maven-public/
```
And then use this library (change `(the latest version)` to the latest version!):
```xml
- com.mojang
+ xyz.fortern
brigadier
(the latest version)
```
-# Contributing
-Contributions are welcome! :D
-
-Most contributions will require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to,
-and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
-contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
# Usage
At the heart of Brigadier, you need a `CommandDispatcher`, where `` is any custom object you choose to identify a "command source".
diff --git a/build.gradle b/build.gradle
index 67ccb2c..5f95c36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,116 +1,57 @@
-import groovy.io.FileType
+plugins {
+ id 'java-library'
+ id 'maven-publish'
+}
-apply plugin: 'java-library'
-apply plugin: 'maven-publish'
+group = 'xyz.fortern'
+version ='1.0.1'
-group = 'com.mojang'
-version = project.hasProperty('buildNumber') ? "${project.majorMinor}.${project.buildNumber}" : "${project.majorMinor}.0-SNAPSHOT"
-
-buildscript {
- repositories {
- mavenCentral()
- maven {
- url "https://libraries.minecraft.net"
- }
- }
+java {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ withSourcesJar()
}
repositories {
- maven {
- url "https://libraries.minecraft.net"
- }
mavenCentral()
}
dependencies {
- testCompile 'com.google.guava:guava:26.0-jre'
- testCompile 'junit:junit-dep:4.11'
- testCompile 'org.hamcrest:hamcrest-library:1.3'
- testCompile 'org.mockito:mockito-core:1.10.19'
- testCompile 'com.google.guava:guava-testlib:26.0-jre'
- testCompile 'org.openjdk.jmh:jmh-core:1.21'
- annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
-}
-
-task sourcesJar(type: Jar) {
- classifier = 'sources'
- from sourceSets.main.allSource
-}
-
-sourceSets {
- main {
- java {
- srcDirs = ['src/main/java']
- }
- resources {
- srcDirs = ['src/main/resources']
- }
- }
- test {
- java {
- srcDirs = ['src/test/java']
- }
- resources {
- srcDirs = ['src/test/resources']
- }
- }
-}
-
-artifacts {
- archives jar
- archives sourcesJar
-}
-
-test {
- testLogging {
- events "failed", "skipped"
- showStandardStreams = true
- showExceptions true
- }
+ // JUnit Jupiter (Aggregator) https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
+ testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+ // Guava: Google Core Libraries For Java https://mvnrepository.com/artifact/com.google.guava/guava
+ implementation 'com.google.guava:guava:33.2.1-jre'
+ // Guava Testing Library https://mvnrepository.com/artifact/com.google.guava/guava-testlib
+ testImplementation 'com.google.guava:guava-testlib:33.2.1-jre'
+ // Hamcrest Library https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library
+ testImplementation 'org.hamcrest:hamcrest-library:3.0'
+ // Mockito Core https://mvnrepository.com/artifact/org.mockito/mockito-core
+ testImplementation 'org.mockito:mockito-core:1.10.19'
+ // JMH Core https://mvnrepository.com/artifact/org.openjdk.jmh/jmh-core
+ testImplementation 'org.openjdk.jmh:jmh-core:1.37'
+ // JMH Generators: Annotation Processors https://mvnrepository.com/artifact/org.openjdk.jmh/jmh-generator-annprocess
+ testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
}
publishing {
publications {
- mavenJava(MavenPublication) {
+ maven(MavenPublication) {
from components.java
- artifact sourcesJar
+ }
+ }
+ repositories {
+ maven {
+ name = 'ForternRelease'
+ url = "https://maven.fortern.xyz/repository/maven-releases/"
+ credentials {
+ username = findProperty('repo.fortern.user')
+ password = findProperty('repo.fortern.password')
+ }
}
}
}
-task report {
+tasks.register('report') {
doLast {
println "##vso[build.updatebuildnumber]${project.version}"
}
}
-
-def publishDir = file("$buildDir/repo")
-
-clean.doLast {
- delete publishDir
-}
-
-if (version.endsWith("SNAPSHOT")) {
- publishing.repositories {
- mavenLocal()
- }
-} else {
- publishing.repositories {
- maven {
- url "$buildDir/repo"
- }
- }
-
- publish.doLast {
- publishDir.eachFileRecurse {
- if (!it.isFile()) {
- return
- }
- // Remove junk files
- if (it.name.contains(".xml") || it.name.contains(".md5")) {
- it.delete()
- }
- }
- }
-}
-
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index e0ecf9d..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-majorMinor: 1.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3345424..249e583 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 37739df..d5fbbf3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 06 16:17:40 EEST 2018
+#Sun Aug 11 12:15:09 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
index cccdd3d..1b6c787
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# 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.
+# 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
-##
+#
+# 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=""
+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
- ;;
- 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
+
# Determine the Java command to use to start the JVM.
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
@@ -81,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
@@ -89,84 +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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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" )
-# 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")"
+ 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/gradlew.bat b/gradlew.bat
index f955316..107acd3 100644
--- 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,15 +29,18 @@ 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
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/settings.gradle b/settings.gradle
index c82198a..c863bac 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
rootProject.name = 'brigadier'
-enableFeaturePreview('STABLE_PUBLISHING')