diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83f20dd..76f0c9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,40 @@ -image: maven:3.8.3-openjdk-17 +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Gradle.gitlab-ci.yml -cache: - paths: - - .m2/repository +# This is the Gradle build system for JVM applications +# https://gradle.org/ +# https://github.com/gradle/gradle +image: gradle:alpine + +# Disable the Gradle daemon for Continuous Integration servers as correctness +# is usually a priority over speed in CI environments. Using a fresh +# runtime for each build is more reliable since the runtime is completely +# isolated from any previous builds. variables: - MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version" + GRADLE_OPTS: "-Dorg.gradle.daemon=false" -verify: +before_script: + - export GRADLE_USER_HOME=`pwd`/.gradle + +build: + stage: build + script: gradle --build-cache assemble + cache: + key: "$CI_COMMIT_REF_NAME" + policy: push + paths: + - build + - .gradle + +test: stage: test - script: - - 'mvn $MAVEN_CLI_OPTS verify' - artifacts: - when: always - reports: - junit: - - "**/target/surefire-reports/TEST-*.xml" + script: gradle check + cache: + key: "$CI_COMMIT_REF_NAME" + policy: pull + paths: + - build + - .gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2f4589d --- /dev/null +++ b/build.gradle @@ -0,0 +1,43 @@ +subprojects { + group = 'eu.jonahbauer' + version = '1.0-SNAPSHOT' + + apply plugin: 'java' + + repositories { + mavenCentral() + } + + compileJava { + sourceCompatibility = 17 + targetCompatibility = 17 + } + + ext { + log4j2 = "2.14.1" + lombok = "1.18.22" + + junit = "5.8.1" + mockito = "4.0.0" + } + + dependencies { + implementation "org.jetbrains:annotations:22.0.0" + implementation "com.google.code.gson:gson:2.8.8" + + implementation "org.apache.logging.log4j:log4j-api:$log4j2" + implementation "org.apache.logging.log4j:log4j-core:$log4j2" + implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4j2" + + testImplementation "org.junit.jupiter:junit-jupiter:$junit" + testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit" + testImplementation "org.mockito:mockito-inline:$mockito" + testImplementation "org.mockito:mockito-junit-jupiter:$mockito" + + compileOnly "org.projectlombok:lombok:$lombok" + annotationProcessor "org.projectlombok:lombok:$lombok" + + testCompileOnly "org.projectlombok:lombok:$lombok" + testAnnotationProcessor "org.projectlombok:lombok:$lombok" + } +} \ 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..7454180 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..e750102 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..c53aefa --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/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/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 +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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +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 + +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*) + 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 + +# 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 \ + "$@" + +# 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..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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=. +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%" == "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%"=="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 b18690d..0000000 --- a/pom.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - 4.0.0 - - eu.jonahbauer - wizard - pom - 1.0-SNAPSHOT - - - wizard-core - wizard-client - wizard-server - wizard-common - - - - 17 - 2.14.1 - 1.18.22 - UTF-8 - - - - - org.jetbrains - annotations - 22.0.0 - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - com.google.code.gson - gson - 2.8.8 - - - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - - - - - org.junit.jupiter - junit-jupiter - 5.8.1 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.8.1 - test - - - org.mockito - mockito-inline - 4.0.0 - test - - - org.mockito - mockito-junit-jupiter - 4.0.0 - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - - org.projectlombok - lombok - ${lombok.version} - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..63a8dff --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'wizard' +include(':wizard-common') +include(':wizard-client:wizard-client-cli') +include(':wizard-client:wizard-client-libgdx') +include(':wizard-server') +include(':wizard-core') diff --git a/wizard-client/build.gradle b/wizard-client/build.gradle new file mode 100644 index 0000000..51f0e64 --- /dev/null +++ b/wizard-client/build.gradle @@ -0,0 +1,6 @@ + +dependencies { + implementation project(':wizard-common') +} + +description = 'wizard-client' diff --git a/wizard-client/pom.xml b/wizard-client/pom.xml deleted file mode 100644 index e9e8659..0000000 --- a/wizard-client/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - wizard - eu.jonahbauer - 1.0-SNAPSHOT - - 4.0.0 - - wizard-client - - - ${java.version} - ${java.version} - - - - - - ${project.groupId} - wizard-common - ${project.version} - - - \ No newline at end of file diff --git a/wizard-client/src/main/resources/.gitkeep b/wizard-client/wizard-client-cli/src/main/java/eu/jonahbauer/wizard/client/cli/.gitkeep similarity index 100% rename from wizard-client/src/main/resources/.gitkeep rename to wizard-client/wizard-client-cli/src/main/java/eu/jonahbauer/wizard/client/cli/.gitkeep diff --git a/wizard-client/wizard-client-cli/src/main/resources/.gitkeep b/wizard-client/wizard-client-cli/src/main/resources/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/wizard-client/wizard-client-libgdx/build.gradle b/wizard-client/wizard-client-libgdx/build.gradle new file mode 100644 index 0000000..e69de29 diff --git a/wizard-client/wizard-client-libgdx/src/main/java/eu/jonahbauer/wizard/client/libgdx/.gitkeep b/wizard-client/wizard-client-libgdx/src/main/java/eu/jonahbauer/wizard/client/libgdx/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/wizard-client/wizard-client-libgdx/src/main/resources/.gitkeep b/wizard-client/wizard-client-libgdx/src/main/resources/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/wizard-common/build.gradle b/wizard-common/build.gradle new file mode 100644 index 0000000..fb36922 --- /dev/null +++ b/wizard-common/build.gradle @@ -0,0 +1,2 @@ + +description = 'wizard-common' diff --git a/wizard-common/pom.xml b/wizard-common/pom.xml deleted file mode 100644 index 11dc79c..0000000 --- a/wizard-common/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - wizard - eu.jonahbauer - 1.0-SNAPSHOT - - 4.0.0 - - wizard-common - - - 17 - 17 - - - \ No newline at end of file diff --git a/wizard-core/build.gradle b/wizard-core/build.gradle new file mode 100644 index 0000000..3e1127b --- /dev/null +++ b/wizard-core/build.gradle @@ -0,0 +1,6 @@ + +dependencies { + implementation project(':wizard-common') +} + +description = 'wizard-core' diff --git a/wizard-core/pom.xml b/wizard-core/pom.xml deleted file mode 100644 index 48302c1..0000000 --- a/wizard-core/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - wizard - eu.jonahbauer - 1.0-SNAPSHOT - - 4.0.0 - - wizard-core - - - ${java.version} - ${java.version} - - - - - ${project.groupId} - wizard-common - ${project.version} - - - \ No newline at end of file diff --git a/wizard-server/build.gradle b/wizard-server/build.gradle new file mode 100644 index 0000000..46309b6 --- /dev/null +++ b/wizard-server/build.gradle @@ -0,0 +1,6 @@ + +dependencies { + implementation project(':wizard-core') +} + +description = 'wizard-server' diff --git a/wizard-server/pom.xml b/wizard-server/pom.xml deleted file mode 100644 index e60c456..0000000 --- a/wizard-server/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - wizard - eu.jonahbauer - 1.0-SNAPSHOT - - 4.0.0 - - wizard-server - - - - ${java.version} - ${java.version} - - - - - ${project.groupId} - wizard-core - ${project.version} - - - - \ No newline at end of file