diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ba902fb..c787171 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,22 +21,22 @@ jobs: with: java-version: '11' distribution: 'adopt' - - name: Build with Maven - run: mvn -B package --file pom.xml + - name: Build with gradle + run: ./gradlew shadowJar - name: Upload Bungee uses: actions/upload-artifact@v2.2.3 with: # Artifact name name: RedisBungee-Bungee # Destination path - path: RedisBungee-Bungee/target/* + path: RedisBungee-Bungee/build/libs/* - name: Upload Velocity uses: actions/upload-artifact@v2.2.3 with: name: RedisBungee-Velocity - path: RedisBungee-Velocity/target/* + path: RedisBungee-Velocity/build/libs/* - name: Upload API uses: actions/upload-artifact@v2.2.3 with: name: RedisBungee-API - path: RedisBungee-API/target/* + path: RedisBungee-API/build/libs/* diff --git a/.gitignore b/.gitignore index 24e0918..5e4db4f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,11 @@ manifest.mf *.versionBackup *.versionsBackup +# gradle +.gradle + # java docs javadoc + +# run-server folders +*/run diff --git a/README.md b/README.md index 86a8158..4940119 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ SpigotMC resource page: [click](https://www.spigotmc.org/resources/redisbungee.8 ## Implementing RedisBungee in your plugin: [![RedisBungee Build](https://github.com/proxiodev/RedisBungee/actions/workflows/maven.yml/badge.svg)](https://github.com/Limework/RedisBungee/actions/workflows/maven.yml) [![](https://jitpack.io/v/ProxioDev/redisbungee.svg)](https://jitpack.io/#ProxioDev/redisbungee) -RedisBungee is distributed as a [maven](https://maven.apache.org) project. +RedisBungee is distributed as a [Gradle](https://gradle.org/) project. By using jitpack [![](https://jitpack.io/v/ProxioDev/redisbungee.svg)](https://jitpack.io/#ProxioDev/redisbungee) @@ -112,7 +112,7 @@ first, install it to your maven local repo ```bash git clone https://github.com/ProxioDev/RedisBungee.git cd RedisBungee -mvn clean install +./gradlew shadowJar ``` then use any of these in your project. ```xml diff --git a/RedisBungee-API/build.gradle.kts b/RedisBungee-API/build.gradle.kts new file mode 100644 index 0000000..71bee84 --- /dev/null +++ b/RedisBungee-API/build.gradle.kts @@ -0,0 +1,87 @@ +import java.io.ByteArrayOutputStream + +plugins { + `java-library` + `maven-publish` + id("net.kyori.blossom") version "1.2.0" + +} + +repositories { + mavenCentral() +} + + +val jedisVersion = "4.3.2" +val configurateVersion = "3.7.3" +val guavaVersion = "31.1-jre" + + +dependencies { + api("com.google.guava:guava:$guavaVersion") + api("redis.clients:jedis:$jedisVersion") + api("com.squareup.okhttp:okhttp:2.7.5") + api("org.spongepowered:configurate-yaml:$configurateVersion") + + // tests + testImplementation("junit:junit:4.13.2") +} + +description = "RedisBungee interafaces" + +blossom { + replaceToken("@version@", "$version") + // GIT + var commit: String = "" + val commitStdout = ByteArrayOutputStream() + rootProject.exec { + standardOutput = commitStdout + commandLine("git", "rev-parse", "HEAD") + } + commit = "$commitStdout".replace("\n", "") // for some reason it adds new line so remove it. + commitStdout.close() + replaceToken("@git_commit@", commit) +} + +java { + withJavadocJar() + withSourcesJar() +} + +tasks { + // thanks again for paper too + withType { + val options = options as StandardJavadocDocletOptions + options.use() + options.isDocFilesSubDirs = true + options.links( + "https://configurate.aoeu.xyz/$configurateVersion/apidocs/", // configurate + "https://javadoc.io/doc/redis.clients/jedis/$jedisVersion/", // jedis + "https://guava.dev/releases/$guavaVersion/api/docs/" // guava + ) + } + + test { + useJUnitPlatform() + } + + compileJava { + options.encoding = Charsets.UTF_8.name() + options.release.set(8) + } + javadoc { + options.encoding = Charsets.UTF_8.name() + + } + processResources { + filteringCharset = Charsets.UTF_8.name() + } +} + +publishing { + publications { + create("maven") { + from(components["java"]) + } + } +} diff --git a/RedisBungee-API/pom.xml b/RedisBungee-API/pom.xml deleted file mode 100644 index 1a87c79..0000000 --- a/RedisBungee-API/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - RedisBungee - com.imaginarycode.minecraft - 0.10.2-SNAPSHOT - - 4.0.0 - - RedisBungee-API - - - - maven-source-plugin - 3.2.1 - - - - - bundle-sources - package - - jar-no-fork - test-jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.2 - - - attach-javadocs - - jar - - - 8 - ../javadoc/${project.name} - - - - - - - - - 8 - 8 - - - - - com.google.guava - guava - 31.1-jre - compile - - - redis.clients - jedis - 4.3.1 - compile - - - org.apache.commons - commons-pool2 - 2.11.1 - compile - - - com.squareup.okhttp - okhttp - 2.7.5 - compile - - - junit - junit - 4.13.2 - test - - - org.spongepowered - configurate-yaml - 3.7.2 - - - - \ No newline at end of file diff --git a/RedisBungee-Velocity/src/main/java-templates/com/imaginarycode/minecraft/redisbungee/PomData.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java similarity index 56% rename from RedisBungee-Velocity/src/main/java-templates/com/imaginarycode/minecraft/redisbungee/PomData.java rename to RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java index 7fe5ee5..4471b0f 100644 --- a/RedisBungee-Velocity/src/main/java-templates/com/imaginarycode/minecraft/redisbungee/PomData.java +++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java @@ -8,8 +8,16 @@ * http://www.eclipse.org/legal/epl-v10.html */ + package com.imaginarycode.minecraft.redisbungee; -public class PomData { - public final static String VERSION = "${project.parent.version}"; +public class Constants { + + public final static String VERSION = "@version@"; + public final static String GIT_COMMIT = "@git_commit@"; + + public static String getGithubCommitLink() { + return "https://github.com/ProxioDev/RedisBungee/commit/" + GIT_COMMIT; + } + } diff --git a/RedisBungee-Bungee/build.gradle.kts b/RedisBungee-Bungee/build.gradle.kts new file mode 100644 index 0000000..ab898b4 --- /dev/null +++ b/RedisBungee-Bungee/build.gradle.kts @@ -0,0 +1,79 @@ +plugins { + `java-library` + `maven-publish` + id("com.github.johnrengelman.shadow") version "8.1.1" + id("xyz.jpenilla.run-waterfall") version "2.0.0" +} + + +repositories { + mavenCentral() + maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } // bungeecord +} +val bungeecordApiVersion = "1.19-R0.1-SNAPSHOT" +dependencies { + api(project(":RedisBungee-API")) { + exclude("com.google.guava", "guava") + exclude("com.google.code.gson", "gson") + } + compileOnly("net.md-5:bungeecord-api:$bungeecordApiVersion") +} + +description = "RedisBungee Bungeecord implementation" + +java { + withJavadocJar() + withSourcesJar() +} + + +tasks { + withType { + val options = options as StandardJavadocDocletOptions + options.use() + options.isDocFilesSubDirs = true + options.links( + "https://ci.md-5.net/job/BungeeCord/ws/api/target/apidocs/", // bungeecord api + ) + } + runWaterfall { + waterfallVersion("1.19") + } + compileJava { + options.encoding = Charsets.UTF_8.name() + options.release.set(8) + } + javadoc { + options.encoding = Charsets.UTF_8.name() + } + processResources { + filteringCharset = Charsets.UTF_8.name() + filesMatching("plugin.yml") { + filter { + it.replace("*{redisbungee.version}*", "$version", false) + } + } + + } + shadowJar { + relocate("redis.clients.jedis", "com.imaginarycode.minecraft.redisbungee.internal.jedis") + relocate("redis.clients.util", "com.imaginarycode.minecraft.redisbungee.internal.jedisutil") + relocate("org.apache.commons.pool", "com.imaginarycode.minecraft.redisbungee.internal.commonspool") + relocate("com.squareup.okhttp", "com.imaginarycode.minecraft.redisbungee.internal.okhttp") + relocate("okio", "com.imaginarycode.minecraft.redisbungee.internal.okio") + relocate("org.json", "com.imaginarycode.minecraft.redisbungee.internal.json") + + // configurate shade + relocate("ninja.leaping.configurate", "com.imaginarycode.minecraft.redisbungee.internal.configurate") + relocate("org.yaml", "com.imaginarycode.minecraft.redisbungee.internal.yml") + } + +} + +publishing { + publications { + create("maven") { + from(components["java"]) + } + } +} \ No newline at end of file diff --git a/RedisBungee-Bungee/pom.xml b/RedisBungee-Bungee/pom.xml deleted file mode 100644 index 9660119..0000000 --- a/RedisBungee-Bungee/pom.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - RedisBungee - com.imaginarycode.minecraft - 0.10.2-SNAPSHOT - - 4.0.0 - - RedisBungee-Bungee - - - 8 - 8 - - - - bungeecord-repo - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.2 - - - attach-javadocs - - jar - - - 8 - true - - net.md-5:* - - ../javadoc/${project.name} - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - redis.clients.jedis - com.imaginarycode.minecraft.redisbungee.internal.jedis - - - - redis.clients.util - com.imaginarycode.minecraft.redisbungee.internal.jedisutil - - - - org.apache.commons.pool - com.imaginarycode.minecraft.redisbungee.internal.commonspool - - - - com.squareup.okhttp - com.imaginarycode.minecraft.redisbungee.internal.okhttp - - - - okio - com.imaginarycode.minecraft.redisbungee.internal.okio - - - com.google - com.imaginarycode.minecraft.redisbungee.internal.google - - - - org.json - com.imaginarycode.minecraft.redisbungee.internal.json - - - org.checkerframework - com.imaginarycode.minecraft.redisbungee.internal.checkframework - - - - ninja.leaping.configurate - com.imaginarycode.minecraft.redisbungee.internal.configurate - - - - - - - - - - - - - com.imaginarycode.minecraft - RedisBungee-API - ${project.parent.version} - - - com.imaginarycode.minecraft - RedisBungee-API - ${project.parent.version} - javadoc - - - net.md-5 - bungeecord-api - 1.17-R0.1-SNAPSHOT - jar - provided - - - - \ No newline at end of file diff --git a/RedisBungee-Bungee/src/main/resources/plugin.yml b/RedisBungee-Bungee/src/main/resources/plugin.yml index de05a1b..3696555 100644 --- a/RedisBungee-Bungee/src/main/resources/plugin.yml +++ b/RedisBungee-Bungee/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: RedisBungee main: com.imaginarycode.minecraft.redisbungee.RedisBungee -version: ${project.parent.version} +version: *{redisbungee.version}* author: "astei, ProxioDev" # This is used so that we can automatically override default BungeeCord behavior. softDepends: ["cmd_find", "cmd_list"] \ No newline at end of file diff --git a/RedisBungee-Velocity/build.gradle.kts b/RedisBungee-Velocity/build.gradle.kts new file mode 100644 index 0000000..35fa624 --- /dev/null +++ b/RedisBungee-Velocity/build.gradle.kts @@ -0,0 +1,71 @@ +plugins { + `java-library` + `maven-publish` + id("com.github.johnrengelman.shadow") version "8.1.1" + id("xyz.jpenilla.run-velocity") version "2.0.0" + +} + +repositories { + mavenCentral() + maven { url = uri("https://repo.papermc.io/repository/maven-public/") } +} + +dependencies { + api(project(":RedisBungee-API")) { + // Since velocity already includes guava / configurate exlude them + exclude("com.google.guava", "guava") + exclude("com.google.code.gson", "gson") + exclude("org.spongepowered", "configurate-yaml") + } + compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT") +} + +description = "RedisBungee Velocity implementation" + +java { + withJavadocJar() + withSourcesJar() +} + +tasks { + withType { + val options = options as StandardJavadocDocletOptions + options.use() + options.isDocFilesSubDirs = true + options.links( + "https://jd.papermc.io/velocity/3.0.0/", // velocity api + ) + } + runVelocity { + velocityVersion("3.2.0-SNAPSHOT") + } + compileJava { + options.encoding = Charsets.UTF_8.name() + options.release.set(11) + } + javadoc { + options.encoding = Charsets.UTF_8.name() + } + processResources { + filteringCharset = Charsets.UTF_8.name() + } + shadowJar { + relocate("redis.clients.jedis", "com.imaginarycode.minecraft.redisbungee.internal.jedis") + relocate("redis.clients.util", "com.imaginarycode.minecraft.redisbungee.internal.jedisutil") + relocate("org.apache.commons.pool", "com.imaginarycode.minecraft.redisbungee.internal.commonspool") + relocate("com.squareup.okhttp", "com.imaginarycode.minecraft.redisbungee.internal.okhttp") + relocate("okio", "com.imaginarycode.minecraft.redisbungee.internal.okio") + relocate("org.json", "com.imaginarycode.minecraft.redisbungee.internal.json") + } + +} + +publishing { + publications { + create("maven") { + from(components["java"]) + } + } +} diff --git a/RedisBungee-Velocity/pom.xml b/RedisBungee-Velocity/pom.xml deleted file mode 100644 index 310ab44..0000000 --- a/RedisBungee-Velocity/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - RedisBungee - com.imaginarycode.minecraft - 0.10.2-SNAPSHOT - - 4.0.0 - - RedisBungee-Velocity - - - 11 - 11 - - - - papermc-repo - https://repo.papermc.io/repository/maven-public/ - - - - - - - src/main/resources - true - - - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - add-plugin-info - - filter-sources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 11 - 11 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.2 - - - attach-javadocs - - jar - - - true - - com.velocitypowered:* - - 11 - ../javadoc/${project.name} - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - redis.clients.jedis - com.imaginarycode.minecraft.redisbungee.internal.jedis - - - - redis.clients.util - com.imaginarycode.minecraft.redisbungee.internal.jedisutil - - - - org.apache.commons.pool - com.imaginarycode.minecraft.redisbungee.internal.commonspool - - - - com.squareup.okhttp - com.imaginarycode.minecraft.redisbungee.internal.okhttp - - - - okio - com.imaginarycode.minecraft.redisbungee.internal.okio - - - org.json - com.imaginarycode.minecraft.redisbungee.internal.json - - - org.checkerframework - com.imaginarycode.minecraft.redisbungee.internal.checkframework - - - - - - - - - - - - - com.imaginarycode.minecraft - RedisBungee-API - ${project.parent.version} - - - com.google.guava - guava - - - org.spongepowered - configurate-yaml - - - - - com.imaginarycode.minecraft - RedisBungee-API - ${project.parent.version} - javadoc - - - com.google.guava - guava - - - org.spongepowered - configurate-yaml - - - - - com.velocitypowered - velocity-api - 3.1.2-SNAPSHOT - jar - provided - - - - \ No newline at end of file diff --git a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java index 4c3f0ea..2c618dd 100644 --- a/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java +++ b/RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java @@ -57,7 +57,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -@Plugin(id = "redisbungee", name = "RedisBungee", version = PomData.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = {"astei", "ProxioDev"}) +@Plugin(id = "redisbungee", name = "RedisBungee", version = Constants.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = {"astei", "ProxioDev"}) public class RedisBungeeVelocityPlugin implements RedisBungeePlugin, ConfigLoader { private final ProxyServer server; private final Logger logger; diff --git a/copyright_print.txt b/copyright_print.txt new file mode 100644 index 0000000..685fc40 --- /dev/null +++ b/copyright_print.txt @@ -0,0 +1,7 @@ +Copyright (c) 2013-present RedisBungee contributors + +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v1.0 +which accompanies this distribution, and is available at + +http://www.eclipse.org/legal/epl-v10.html \ No newline at end of file diff --git a/gradle.build.kts b/gradle.build.kts new file mode 100644 index 0000000..e69de29 diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..54a31fb --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group = com.imaginarycode.minecraft +version = 0.11.0-SNAPSHOT \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..ccebba7 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bdc9a83 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..79a61d4 --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/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 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/HEAD/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 +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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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 + +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 ;; +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 + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + 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 +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# 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. + +# 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 \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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 new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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 +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +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="-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% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/makeJavadocs.sh b/makeJavadocs.sh deleted file mode 100644 index 3047568..0000000 --- a/makeJavadocs.sh +++ /dev/null @@ -1,3 +0,0 @@ -rm -rf javadoc -mkdir javadoc -mvn clean install javadoc:javadoc -pl RedisBungee-API,RedisBungee-Bungee,RedisBungee-Velocity -am \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 6ca011c..0000000 --- a/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - com.imaginarycode.minecraft - RedisBungee - pom - 0.10.2-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - - - RedisBungee-API - RedisBungee-Bungee - RedisBungee-Velocity - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..181ac78 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} + +rootProject.name = "RedisBungee-Parent" + +include(":RedisBungee-Velocity") +include(":RedisBungee-Bungee") +include(":RedisBungee-API")