From a52ba616fedcae7308abe06bf72be1bc69ed4c57 Mon Sep 17 00:00:00 2001 From: Esophose Date: Mon, 22 Apr 2019 18:34:31 -0600 Subject: [PATCH] Gradle project --- .gitignore | 34 +++- .gitlab-ci.yml | 24 ++- UltimateTimber-Adapter/Current/build.gradle | 10 + UltimateTimber-Adapter/Current/pom.xml | 51 ------ UltimateTimber-Adapter/Legacy/build.gradle | 10 + UltimateTimber-Adapter/Legacy/pom.xml | 51 ------ UltimateTimber/Core/build.gradle | 7 + UltimateTimber/Core/pom.xml | 30 --- UltimateTimber/Plugin/build.gradle | 16 ++ UltimateTimber/Plugin/pom.xml | 69 ------- .../Plugin/src/main/resources/plugin.yml | 2 +- build.gradle | 44 +++++ gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ pom.xml | 40 ---- settings.gradle | 13 ++ 17 files changed, 403 insertions(+), 260 deletions(-) create mode 100644 UltimateTimber-Adapter/Current/build.gradle delete mode 100644 UltimateTimber-Adapter/Current/pom.xml create mode 100644 UltimateTimber-Adapter/Legacy/build.gradle delete mode 100644 UltimateTimber-Adapter/Legacy/pom.xml create mode 100644 UltimateTimber/Core/build.gradle delete mode 100644 UltimateTimber/Core/pom.xml create mode 100644 UltimateTimber/Plugin/build.gradle delete mode 100644 UltimateTimber/Plugin/pom.xml create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 97edb6c..d50aa4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,31 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.settings +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +/.gradle/ +/.settings/ .idea/ -*.iml +build/ target/ -.settings/ -bin/ -.classpath -.project \ No newline at end of file +*.iml +/bin/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6a9390..259460d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,19 @@ +image: gradle:alpine + +variables: + path: "/builds/$CI_PROJECT_PATH" + +before_script: + - export GRADLE_USER_HOME=`pwd`/.gradle + stages: - build -variables: - name: "UltimateTimber" - path: "/builds/$CI_PROJECT_PATH" - version: "2.0.0" - build: stage: build - image: maven:3.5.3-jdk-8 script: - - find $path/ -type f -name "*.xml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g - - find $path/ -type f -name "*.yml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g - - mvn clean package - - find $path/ -depth -path '*original*' -delete - - mv $path/target/*.jar $path/ + - gradle build + - mv $path/build/libs/*.jar $path/ artifacts: - name: $name-$version paths: - - "$path/*.jar" + - $path/*.jar diff --git a/UltimateTimber-Adapter/Current/build.gradle b/UltimateTimber-Adapter/Current/build.gradle new file mode 100644 index 0000000..26de559 --- /dev/null +++ b/UltimateTimber-Adapter/Current/build.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +dependencies { + compile project(':UltimateTimber-Core') + compileOnly 'org.spigotmc:spigot:1.13.2' + compileOnly 'com.gmail.nossr50:mcmmo:1.5.09' + compileOnly 'com.gamingmesh:jobs:4.6.0' +} diff --git a/UltimateTimber-Adapter/Current/pom.xml b/UltimateTimber-Adapter/Current/pom.xml deleted file mode 100644 index 6a08f35..0000000 --- a/UltimateTimber-Adapter/Current/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - - com.songoda.ultimatetimber - UltimateTimber-Parent - maven-version-number - ../../pom.xml - - - UltimateTimber-CurrentAdapter - - - - - org.spigotmc - spigot - 1.13.2 - provided - - - - com.gmail.nossr50 - mcmmo - 1.5.09 - provided - - - - com.gamingmesh - jobs - 4.6.0 - provided - - - - ${project.groupId} - UltimateTimber-Core - ${project.version} - compile - - - - - clean install - ${project.artifactId} - - diff --git a/UltimateTimber-Adapter/Legacy/build.gradle b/UltimateTimber-Adapter/Legacy/build.gradle new file mode 100644 index 0000000..5fbc50f --- /dev/null +++ b/UltimateTimber-Adapter/Legacy/build.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +dependencies { + compile project(':UltimateTimber-Core') + compileOnly 'org.spigotmc:spigot:1.12.2' + compileOnly 'com.gmail.nossr50:mcmmo:1.5.09' + compileOnly 'com.gamingmesh:jobs:4.6.0' +} diff --git a/UltimateTimber-Adapter/Legacy/pom.xml b/UltimateTimber-Adapter/Legacy/pom.xml deleted file mode 100644 index 6d4607e..0000000 --- a/UltimateTimber-Adapter/Legacy/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - - com.songoda.ultimatetimber - UltimateTimber-Parent - maven-version-number - ../../pom.xml - - - UltimateTimber-LegacyAdapter - - - - - org.spigotmc - spigot - 1.12.2 - provided - - - - com.gmail.nossr50 - mcmmo - 1.5.09 - provided - - - - com.gamingmesh - jobs - 4.6.0 - provided - - - - ${project.groupId} - UltimateTimber-Core - ${project.version} - compile - - - - - clean install - ${project.artifactId} - - diff --git a/UltimateTimber/Core/build.gradle b/UltimateTimber/Core/build.gradle new file mode 100644 index 0000000..67dacc6 --- /dev/null +++ b/UltimateTimber/Core/build.gradle @@ -0,0 +1,7 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +dependencies { + compileOnly 'org.spigotmc:spigot:1.13.2' +} diff --git a/UltimateTimber/Core/pom.xml b/UltimateTimber/Core/pom.xml deleted file mode 100644 index 9c183e3..0000000 --- a/UltimateTimber/Core/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - com.songoda.ultimatetimber - UltimateTimber-Parent - maven-version-number - ../../pom.xml - - - UltimateTimber-Core - - - - - org.spigotmc - spigot - 1.13.2 - provided - - - - - clean install - ${project.artifactId} - - diff --git a/UltimateTimber/Plugin/build.gradle b/UltimateTimber/Plugin/build.gradle new file mode 100644 index 0000000..7bf5571 --- /dev/null +++ b/UltimateTimber/Plugin/build.gradle @@ -0,0 +1,16 @@ +import org.apache.tools.ant.filters.ReplaceTokens + +dependencies { + compile project(':UltimateTimber-Core') + compile project(':UltimateTimber-CurrentAdapter') + compile project(':UltimateTimber-LegacyAdapter') + compileOnly 'org.spigotmc:spigot:1.13.2' +} + + +processResources { + from (sourceSets.main.resources.srcDirs) { + include '**/*.yml' + filter ReplaceTokens, tokens: ["version": project.property("version")] + } +} diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml deleted file mode 100644 index 286218a..0000000 --- a/UltimateTimber/Plugin/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - - com.songoda.ultimatetimber - UltimateTimber-Parent - maven-version-number - ../../pom.xml - - - UltimateTimber-Plugin - - - - - org.spigotmc - spigot - 1.13.2 - provided - - - - ${project.groupId} - UltimateTimber-Core - ${project.version} - compile - - - - ${project.groupId} - UltimateTimber-CurrentAdapter - ${project.version} - compile - - - - ${project.groupId} - UltimateTimber-LegacyAdapter - ${project.version} - compile - - - - - clean install - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - package - - shade - - - false - ../../target\UltimateTimber-${project.version}.jar - - - - - - - diff --git a/UltimateTimber/Plugin/src/main/resources/plugin.yml b/UltimateTimber/Plugin/src/main/resources/plugin.yml index bd05a36..9a3daf7 100644 --- a/UltimateTimber/Plugin/src/main/resources/plugin.yml +++ b/UltimateTimber/Plugin/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: UltimateTimber -version: maven-version-number +version: @version@ author: Songoda main: com.songoda.ultimatetimber.UltimateTimber api-version: 1.13 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..8635a98 --- /dev/null +++ b/build.gradle @@ -0,0 +1,44 @@ +allprojects { + apply plugin: 'java' + group = 'com.songoda.ultimatetimber' + version = '2.0.0' +} + +subprojects { + sourceCompatibility = 1.8 + + repositories { + mavenCentral() + jcenter() + + maven { + url = 'http://repo.songoda.com/artifactory/private' + } + } +} + +dependencies { + compile project(':UltimateTimber-Core') + compile project(':UltimateTimber-CurrentAdapter') + compile project(':UltimateTimber-LegacyAdapter') + compile project(':UltimateTimber-Plugin') +} + +configurations { + childJars +} + +dependencies { + subprojects.each { + childJars project(it.path) + } +} + +jar { + dependsOn configurations.childJars + from { + configurations.childJars.collect { + zipTree(it) + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d1dae09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Apr 22 18:01:52 MDT 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; +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" = "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" ;; + 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, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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" + +@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 + +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 init + +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 + +: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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index b38997d..0000000 --- a/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - com.songoda.ultimatetimber - UltimateTimber-Parent - pom - maven-version-number - - - UltimateTimber/Core - UltimateTimber-Adapter/Current - UltimateTimber-Adapter/Legacy - UltimateTimber/Plugin - - - - - songoda-repo - http://repo.songoda.com/artifactory/private - - - - - clean install - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..6bcb16c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'UltimateTimber' +include(':UltimateTimber-Core') +include(':UltimateTimber-CurrentAdapter') +include(':UltimateTimber-LegacyAdapter') +include(':UltimateTimber-Plugin') +project(':UltimateTimber-Core').projectDir = file('UltimateTimber/Core') +project(':UltimateTimber-CurrentAdapter').projectDir = file('UltimateTimber-Adapter/Current') +project(':UltimateTimber-LegacyAdapter').projectDir = file('UltimateTimber-Adapter/Legacy') +project(':UltimateTimber-Plugin').projectDir = file('UltimateTimber/Plugin')