Update to Gradle 7 (#3051)

api/build.gradle

@@ -50,21 +50,29 @@ if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePass
         sign configurations.archives
     }
 
-    uploadArchives {
+    publishing {
         repositories {
-            mavenDeployer {
+            maven {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+                def snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
 
-                repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
+                credentials {
-                    authentication(userName: sonatypeUsername, password: sonatypePassword)
+                    username sonatypeUsername
+                    password sonatypePassword
+                }
+            }
         }
 
-                snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots/') {
+        publications {
-                    authentication(userName: sonatypeUsername, password: sonatypePassword)
+            mavenJava(MavenPublication) {
-                }
+                artifactId = 'api'
+
+                from components.java
+                artifact sourcesJar
+                artifact javadocJar
 
                 pom {
-                    project {
                     name 'LuckPerms API'
                     description 'A permissions plugin for Minecraft servers.'
                     url 'https://luckperms.net'
@@ -104,6 +112,5 @@ if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePass
             }
         }
     }
-    }
 }
 */

build.gradle

@@ -1,19 +1,13 @@
-buildscript {
+plugins {
-    repositories {
+    id 'org.cadixdev.licenser' version '0.6.1' apply false
-        maven { url 'https://plugins.gradle.org/m2' }
-    }
-
-    dependencies {
-        classpath 'gradle.plugin.net.minecrell:licenser:0.4.1'
-    }
 }
 
 defaultTasks 'licenseFormat', 'build'
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
-    apply plugin: 'net.minecrell.licenser'
+    apply plugin: 'org.cadixdev.licenser'
 
     group = 'me.lucko.luckperms'
     version = '5.3-SNAPSHOT'

bukkit-legacy/build.gradle

@@ -1,15 +1,15 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 dependencies {
-    compile project(':bukkit')
+    implementation project(':bukkit')
-    compile 'com.google.code.gson:gson:2.7'
+    implementation 'com.google.code.gson:gson:2.7'
-    compile 'com.google.guava:guava:19.0'
+    implementation 'com.google.guava:guava:19.0'
 }
 
 shadowJar {
-    archiveName = 'luckperms-bukkitlegacy.jarinjar'
+    archiveFileName = 'luckperms-bukkitlegacy.jarinjar'
 
     dependencies {
         include(dependency('me.lucko.luckperms:.*'))

bukkit-legacy/loader/build.gradle

@@ -9,19 +9,18 @@ repositories {
 dependencies {
     compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT'
 
-    compile project(':api')
+    implementation project(':api')
-    compile project(':common:loader-utils')
+    implementation project(':common:loader-utils')
 }
 
 processResources {
-    from(sourceSets.main.resources.srcDirs) {
+    filesMatching('plugin.yml') {
-        expand 'pluginVersion': project.ext.fullVersion
+        expand 'version': project.ext.fullVersion
-        include 'plugin.yml'
     }
 }
 
 shadowJar {
-    archiveName = "LuckPerms-Bukkit-Legacy-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Bukkit-Legacy-${project.ext.fullVersion}.jar"
 
     from {
         project(':bukkit-legacy').tasks.shadowJar.archiveFile

bukkit-legacy/loader/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: LuckPerms
-version: ${pluginVersion}
+version: @pluginVersion@
 description: A permissions plugin
 author: Luck
 website: https://luckperms.net

bukkit/build.gradle

@@ -1,5 +1,6 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'java'
 }
 
 repositories {
@@ -8,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
     compileOnly project(':common:loader-utils')
 
     compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT'
@@ -18,14 +19,14 @@ dependencies {
         exclude(module: 'adventure-nbt')
     }
     compileOnly 'me.lucko:commodore:1.9'
-    compileOnly('net.milkbowl.vault:VaultAPI:1.6') {
+    compileOnly('net.milkbowl.vault:VaultAPI:1.7') {
         exclude(module: 'bukkit')
     }
     compileOnly 'lilypad.client.connect:api:0.0.1-SNAPSHOT'
 }
 
 shadowJar {
-    archiveName = 'luckperms-bukkit.jarinjar'
+    archiveFileName = 'luckperms-bukkit.jarinjar'
 
     dependencies {
         include(dependency('me.lucko.luckperms:.*'))

bukkit/loader/build.gradle

@@ -9,19 +9,18 @@ repositories {
 dependencies {
     compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT'
 
-    compile project(':api')
+    implementation project(':api')
-    compile project(':common:loader-utils')
+    implementation project(':common:loader-utils')
 }
 
 processResources {
-    from(sourceSets.main.resources.srcDirs) {
+    filesMatching('plugin.yml') {
-        expand 'pluginVersion': project.ext.fullVersion
+        expand 'version': project.ext.fullVersion
-        include 'plugin.yml'
     }
 }
 
 shadowJar {
-    archiveName = "LuckPerms-Bukkit-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Bukkit-${project.ext.fullVersion}.jar"
 
     from {
         project(':bukkit').tasks.shadowJar.archiveFile

bukkit/loader/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: LuckPerms
-version: ${pluginVersion}
+version: @pluginVersion@
 description: A permissions plugin
 author: Luck
 website: https://luckperms.net

bungee/build.gradle

@@ -1,12 +1,12 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
     compileOnly project(':common:loader-utils')
 
-    compileOnly 'net.md-5:bungeecord-api:1.15-SNAPSHOT'
+    compileOnly 'net.md-5:bungeecord-api:1.16-R0.4'
     compileOnly('me.lucko:adventure-platform-bungeecord:4.8.1') {
         exclude(module: 'adventure-bom')
         exclude(module: 'adventure-api')
@@ -16,7 +16,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'luckperms-bungee.jarinjar'
+    archiveFileName = 'luckperms-bungee.jarinjar'
 
     dependencies {
         include(dependency('me.lucko.luckperms:.*'))

bungee/loader/build.gradle

@@ -5,19 +5,18 @@ plugins {
 dependencies {
     compileOnly 'net.md-5:bungeecord-api:1.15-SNAPSHOT'
 
-    compile project(':api')
+    implementation project(':api')
-    compile project(':common:loader-utils')
+    implementation project(':common:loader-utils')
 }
 
 processResources {
-    from(sourceSets.main.resources.srcDirs) {
+    filesMatching('plugin.yml') {
-        expand 'pluginVersion': project.ext.fullVersion
+        expand 'version': project.ext.fullVersion
-        include 'plugin.yml'
     }
 }
 
 shadowJar {
-    archiveName = "LuckPerms-Bungee-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Bungee-${project.ext.fullVersion}.jar"
 
     from {
         project(':bungee').tasks.shadowJar.archiveFile

bungee/loader/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: LuckPerms
-version: ${pluginVersion}
+version: @pluginVersion@
 description: A permissions plugin
 author: Luck
 main: me.lucko.luckperms.bungee.loader.BungeeLoaderPlugin

common/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id 'java-library'
+}
+
 test {
     useJUnitPlatform {
         excludeTags 'dependency_checksum'
@@ -5,69 +9,69 @@ test {
 }
 
 dependencies {
-    testCompile 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    testCompile 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 
-    compile project(':api')
+    api project(':api')
-    compile 'org.checkerframework:checker-qual:3.12.0'
+    api 'org.checkerframework:checker-qual:3.12.0'
 
     compileOnly project(':common:loader-utils')
 
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     compileOnly 'org.apache.logging.log4j:log4j-api:2.14.0'
 
-    compile('net.kyori:adventure-api:4.8.1') {
+    api('net.kyori:adventure-api:4.8.1') {
         exclude(module: 'adventure-bom')
         exclude(module: 'checker-qual')
         exclude(module: 'annotations')
     }
 
-    compile('net.kyori:adventure-text-serializer-gson:4.8.1') {
+    api('net.kyori:adventure-text-serializer-gson:4.8.1') {
         exclude(module: 'adventure-bom')
         exclude(module: 'adventure-api')
         exclude(module: 'gson')
     }
 
-    compile('net.kyori:adventure-text-serializer-legacy:4.8.1') {
+    api('net.kyori:adventure-text-serializer-legacy:4.8.1') {
         exclude(module: 'adventure-bom')
         exclude(module: 'adventure-api')
     }
 
-    compile('net.kyori:adventure-text-serializer-plain:4.8.1') {
+    api('net.kyori:adventure-text-serializer-plain:4.8.1') {
         exclude(module: 'adventure-bom')
         exclude(module: 'adventure-api')
     }
 
-    compile('net.kyori:event-api:3.0.0') {
+    api('net.kyori:event-api:3.0.0') {
         exclude(module: 'checker-qual')
         exclude(module: 'guava')
     }
 
-    compile 'com.google.code.gson:gson:2.7'
+    api 'com.google.code.gson:gson:2.7'
-    compile 'com.google.guava:guava:19.0'
+    api 'com.google.guava:guava:19.0'
 
-    compile 'com.github.ben-manes.caffeine:caffeine:2.9.0'
+    api 'com.github.ben-manes.caffeine:caffeine:2.9.0'
-    compile 'com.squareup.okhttp3:okhttp:3.14.9'
+    api 'com.squareup.okhttp3:okhttp:3.14.9'
-    compile 'com.squareup.okio:okio:1.17.5'
+    api 'com.squareup.okio:okio:1.17.5'
-    compile 'net.bytebuddy:byte-buddy:1.10.22'
+    api 'net.bytebuddy:byte-buddy:1.10.22'
-    compile('org.spongepowered:configurate-core:3.7.2') {
+    api('org.spongepowered:configurate-core:3.7.2') {
         transitive = false
     }
-    compile('org.spongepowered:configurate-yaml:3.7.2') {
+    api('org.spongepowered:configurate-yaml:3.7.2') {
         transitive = false
     }
-    compile('org.spongepowered:configurate-gson:3.7.2') {
+    api('org.spongepowered:configurate-gson:3.7.2') {
         transitive = false
     }
-    compile ('org.spongepowered:configurate-hocon:3.7.2') {
+    api('org.spongepowered:configurate-hocon:3.7.2') {
         transitive = false
     }
-    compile('me.lucko.configurate:configurate-toml:3.7') {
+    api('me.lucko.configurate:configurate-toml:3.7') {
         transitive = false
     }
-    compile 'com.zaxxer:HikariCP:4.0.3'
+    api 'com.zaxxer:HikariCP:4.0.3'
-    compile 'redis.clients:jedis:3.5.2'
+    api 'redis.clients:jedis:3.5.2'
-    compile 'com.rabbitmq:amqp-client:5.12.0'
+    api 'com.rabbitmq:amqp-client:5.12.0'
-    compile 'org.mongodb:mongo-java-driver:3.12.8'
+    api 'org.mongodb:mongo-java-driver:3.12.8'
-    compile 'org.yaml:snakeyaml:1.28'
+    api 'org.yaml:snakeyaml:1.28'
 }

fabric/build.gradle

@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'com.github.johnrengelman.shadow' version '4.0.1'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'fabric-loom' version '0.6-SNAPSHOT'
 }
 
@@ -36,24 +36,18 @@ dependencies {
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))
 
-    compile project(':common')
+    implementation project(':common')
 }
 
 processResources {
     inputs.property 'version', project.ext.fullVersion
-
+    filesMatching('fabric-mod.json') {
-    from(sourceSets.main.resources.srcDirs) {
-        include 'fabric.mod.json'
         expand 'version': project.ext.fullVersion
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'fabric.mod.json'
-    }
 }
 
 shadowJar {
-    archiveName = "luckpermsfabric-${project.ext.fullVersion}-dev.jar"
+    archiveFileName = "luckpermsfabric-${project.ext.fullVersion}-dev.jar"
 
     dependencies {
         exclude('net.fabricmc:.*')
@@ -84,9 +78,9 @@ shadowJar {
 
 task remappedShadowJar(type: RemapJarTask) {
     dependsOn tasks.shadowJar
-    input = tasks.shadowJar.archivePath
+    input.set(tasks.shadowJar.archiveFile)
-    addNestedDependencies = true
+    addNestedDependencies.set(true)
-    archiveName = "LuckPerms-Fabric-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Fabric-${project.ext.fullVersion}.jar"
 }
 
 tasks.assemble.dependsOn tasks.remappedShadowJar

fabric/src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "luckperms",
-  "version": "${version}",
+  "version": "@version@",
   "name": "LuckPerms",
   "icon": "assets/luckperms/icon.png",
   "description": "A permissions plugin (mod)",

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 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
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  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
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+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" "$@"

nukkit/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 repositories {
@@ -8,14 +8,14 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
     compileOnly project(':common:loader-utils')
 
     compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT'
 }
 
 shadowJar {
-    archiveName = 'luckperms-nukkit.jarinjar'
+    archiveFileName = 'luckperms-nukkit.jarinjar'
 
     dependencies {
         include(dependency('me.lucko.luckperms:.*'))

nukkit/loader/build.gradle

@@ -10,19 +10,18 @@ repositories {
 dependencies {
     compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT'
 
-    compile project(':api')
+    implementation project(':api')
-    compile project(':common:loader-utils')
+    implementation project(':common:loader-utils')
 }
 
 processResources {
-    from(sourceSets.main.resources.srcDirs) {
+    filesMatching('plugin.yml') {
-        expand 'pluginVersion': project.ext.fullVersion
+        expand 'version': project.ext.fullVersion
-        include 'plugin.yml'
     }
 }
 
 shadowJar {
-    archiveName = "LuckPerms-Nukkit-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Nukkit-${project.ext.fullVersion}.jar"
 
     from {
         project(':nukkit').tasks.shadowJar.archiveFile

nukkit/loader/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: LuckPerms
-version: ${pluginVersion}
+version: @pluginVersion@
 api: ["1.0.5"]
 description: A permissions plugin
 author: Luck

sponge/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'net.kyori.blossom' version '1.1.0'
+    id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 repositories {
@@ -8,10 +8,10 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
-    compile project(':sponge:sponge-service')
+    implementation project(':sponge:sponge-service')
-    compile project(':sponge:sponge-service-api6')
+    implementation project(':sponge:sponge-service-api6')
-    compile project(':sponge:sponge-service-api7')
+    implementation project(':sponge:sponge-service-api7')
 
     compileOnly('org.spongepowered:spongeapi:7.3.0') {
         exclude(module: 'configurate-core')
@@ -33,7 +33,7 @@ blossom {
 }
 
 shadowJar {
-    archiveName = "LuckPerms-Sponge-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Sponge-${project.ext.fullVersion}.jar"
 
     dependencies {
         include(dependency('net.luckperms:.*'))

sponge/sponge-service-api6/build.gradle

@@ -3,8 +3,8 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
-    compile project(':sponge:sponge-service')
+    implementation project(':sponge:sponge-service')
 
     compileOnly('org.spongepowered:spongeapi:6.0.0') {
         exclude(module: 'configurate-core')

sponge/sponge-service-api7/build.gradle

@@ -3,8 +3,8 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
-    compile project(':sponge:sponge-service')
+    implementation project(':sponge:sponge-service')
 
     compileOnly('org.spongepowered:spongeapi:7.3.0') {
         exclude(module: 'configurate-core')

sponge/sponge-service/build.gradle

@@ -3,7 +3,7 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
 
     compileOnly('org.spongepowered:spongeapi:7.2.0') {
         exclude(module: 'configurate-core')

velocity/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'net.kyori.blossom' version '1.1.0'
+    id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 repositories {
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    compile project(':common')
+    implementation project(':common')
 
     compileOnly 'com.velocitypowered:velocity-api:3.0.0'
     annotationProcessor 'com.velocitypowered:velocity-api:3.0.0'
@@ -20,7 +20,7 @@ blossom {
 }
 
 shadowJar {
-    archiveName = "LuckPerms-Velocity-${project.ext.fullVersion}.jar"
+    archiveFileName = "LuckPerms-Velocity-${project.ext.fullVersion}.jar"
 
     dependencies {
         include(dependency('net.luckperms:.*'))