From da54383ec9f7012761bb2d58166e53dc16a7104b Mon Sep 17 00:00:00 2001 From: Jonas Franke Date: Fri, 10 Feb 2023 11:08:56 +0100 Subject: [PATCH 01/12] change maven to gradle --- .gitignore | 1 + .gradle/7.6/checksums/checksums.lock | Bin 0 -> 17 bytes .../dependencies-accessors.lock | Bin 0 -> 17 bytes .../7.6/dependencies-accessors/gc.properties | 0 .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/7.6/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/7.6/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/7.6/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/file-system.probe | Bin 0 -> 8 bytes .gradle/vcs-1/gc.properties | 0 build.gradle | 48 ++++ gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 244 ++++++++++++++++++ gradlew.bat | 92 +++++++ pom.xml | 109 -------- settings.gradle | 5 + 18 files changed, 398 insertions(+), 109 deletions(-) create mode 100644 .gradle/7.6/checksums/checksums.lock create mode 100644 .gradle/7.6/dependencies-accessors/dependencies-accessors.lock create mode 100644 .gradle/7.6/dependencies-accessors/gc.properties create mode 100644 .gradle/7.6/executionHistory/executionHistory.lock create mode 100644 .gradle/7.6/fileChanges/last-build.bin create mode 100644 .gradle/7.6/fileHashes/fileHashes.lock create mode 100644 .gradle/7.6/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/file-system.probe create mode 100644 .gradle/vcs-1/gc.properties 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 6b6da0f8..849a6138 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ target /target/* /target/ /.idea/ +/build/ diff --git a/.gradle/7.6/checksums/checksums.lock b/.gradle/7.6/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..59178486f7bbbf1946f668dd77da0f75793db4dc GIT binary patch literal 17 VcmZQ(xVL*}LquRE0~j!Q0{}7C1T_Ev literal 0 HcmV?d00001 diff --git a/.gradle/7.6/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.6/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000000000000000000000000000000000000..d6ac345969aba2365580255d017724d4fe9e88c4 GIT binary patch literal 17 ScmZRsZCk0O%`e-{00jUe`~tiH literal 0 HcmV?d00001 diff --git a/.gradle/7.6/dependencies-accessors/gc.properties b/.gradle/7.6/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.gradle/7.6/executionHistory/executionHistory.lock b/.gradle/7.6/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..3d3cc55526e7bd5ed3b93fe4722be892ba33592c GIT binary patch literal 17 UcmZS151Oa@{H@PP1_)pU05$*wegFUf literal 0 HcmV?d00001 diff --git a/.gradle/7.6/fileChanges/last-build.bin b/.gradle/7.6/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/7.6/fileHashes/fileHashes.lock b/.gradle/7.6/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..7837582603d7e00f4638e72e2d7dbf178e4f7b3a GIT binary patch literal 17 UcmZR6z4jyX*FP '} + 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 00000000..93e3f59f --- /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/pom.xml b/pom.xml deleted file mode 100644 index 5c7fadb1..00000000 --- a/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - 4.0.0 - - - - org.springframework.boot - spring-boot-starter-parent - 3.0.1 - - - de.orciument - JavaTwitchBot - 0.0.1-SNAPSHOT - JavaTwitchBot - JavaTwitchBot - - 17 - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework - spring-beans - - - org.reflections - reflections - 0.10.2 - - - com.github.twitch4j - twitch4j - 1.12.0 - - - ch.qos.logback - logback-classic - - - org.springframework - spring-jdbc - 5.3.23 - - - org.junit.jupiter - junit-jupiter-api - - - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - src - - - src/resources - - - src/main/modules/ - - - - - - - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..85e47421 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'JavaTwitchBot' From a20f6949a46009436c609c8451739947a5438997 Mon Sep 17 00:00:00 2001 From: Jonas Franke Date: Fri, 10 Feb 2023 13:48:06 +0100 Subject: [PATCH 02/12] add .gradle --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 849a6138..b691bc51 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ target /target/ /.idea/ /build/ +/.gradle/ From 7f5609ccef9537e74d8ef35632cd88973dc771ff Mon Sep 17 00:00:00 2001 From: Jonas Franke Date: Fri, 10 Feb 2023 13:48:56 +0100 Subject: [PATCH 03/12] rm .gradle --- .gradle/7.6/checksums/checksums.lock | Bin 17 -> 0 bytes .../dependencies-accessors.lock | Bin 17 -> 0 bytes .gradle/7.6/dependencies-accessors/gc.properties | 0 .gradle/7.6/executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .gradle/7.6/fileChanges/last-build.bin | Bin 1 -> 0 bytes .gradle/7.6/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .gradle/7.6/gc.properties | 0 .gradle/buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 0 bytes .gradle/buildOutputCleanup/cache.properties | 2 -- .gradle/file-system.probe | Bin 8 -> 0 bytes .gradle/vcs-1/gc.properties | 0 11 files changed, 2 deletions(-) delete mode 100644 .gradle/7.6/checksums/checksums.lock delete mode 100644 .gradle/7.6/dependencies-accessors/dependencies-accessors.lock delete mode 100644 .gradle/7.6/dependencies-accessors/gc.properties delete mode 100644 .gradle/7.6/executionHistory/executionHistory.lock delete mode 100644 .gradle/7.6/fileChanges/last-build.bin delete mode 100644 .gradle/7.6/fileHashes/fileHashes.lock delete mode 100644 .gradle/7.6/gc.properties delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 .gradle/buildOutputCleanup/cache.properties delete mode 100644 .gradle/file-system.probe delete mode 100644 .gradle/vcs-1/gc.properties diff --git a/.gradle/7.6/checksums/checksums.lock b/.gradle/7.6/checksums/checksums.lock deleted file mode 100644 index 59178486f7bbbf1946f668dd77da0f75793db4dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 VcmZQ(xVL*}LquRE0~j!Q0{}7C1T_Ev diff --git a/.gradle/7.6/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.6/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index d6ac345969aba2365580255d017724d4fe9e88c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 ScmZRsZCk0O%`e-{00jUe`~tiH diff --git a/.gradle/7.6/dependencies-accessors/gc.properties b/.gradle/7.6/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/7.6/executionHistory/executionHistory.lock b/.gradle/7.6/executionHistory/executionHistory.lock deleted file mode 100644 index 3d3cc55526e7bd5ed3b93fe4722be892ba33592c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZS151Oa@{H@PP1_)pU05$*wegFUf diff --git a/.gradle/7.6/fileChanges/last-build.bin b/.gradle/7.6/fileChanges/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/.gradle/7.6/fileHashes/fileHashes.lock b/.gradle/7.6/fileHashes/fileHashes.lock deleted file mode 100644 index 7837582603d7e00f4638e72e2d7dbf178e4f7b3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZR6z4jyX*FP Date: Fri, 10 Feb 2023 15:21:37 +0100 Subject: [PATCH 04/12] add spring boot gradle plugin --- build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5f907e9d..2ae93a04 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,12 @@ plugins { id 'java-library' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'org.springframework.boot' version '3.0.2' } +apply plugin: 'java' +apply plugin: 'io.spring.dependency-management' + repositories { mavenLocal() maven { @@ -13,8 +17,8 @@ repositories { dependencies { api 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.1' - api 'org.springframework.boot:spring-boot-starter-web:3.0.1' - api 'org.springframework.boot:spring-boot-starter-data-jpa:3.0.1' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' api 'org.springframework:spring-beans:6.0.3' api 'org.reflections:reflections:0.10.2' api 'com.github.twitch4j:twitch4j:1.12.0' @@ -39,10 +43,10 @@ publishing { } } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } -tasks.withType(Javadoc) { +tasks.withType(Javadoc).configureEach { options.encoding = 'UTF-8' } From ee744427ed6ce5e1b3e995550fb319c4e93f7d97 Mon Sep 17 00:00:00 2001 From: Jonas Franke Date: Fri, 10 Feb 2023 18:14:01 +0100 Subject: [PATCH 05/12] merged master to dev/gradle --- .github/workflows/build.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f303cf1..91782992 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,14 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.9.0 with: java-version: 17 - distribution: 'temurin' - cache: maven - - name: Build with Maven - run: mvn --batch-mode --update-snapshots package \ No newline at end of file + distribution: 'adopt' + cache: gradle + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: Build with Gradle + run: sudo chmod +x gradlew && ./gradlew build + - name: Compile code + run: ./gradlew shadowJar \ No newline at end of file From 04f2447fe38241f459d2fb36124e5df8ce87ce3c Mon Sep 17 00:00:00 2001 From: Jonas Franke Date: Fri, 10 Feb 2023 22:13:50 +0100 Subject: [PATCH 06/12] refactor project --- src/main/{ => java/main}/Application.java | 0 .../{inputs => java/main}/Twitch4J/Twitch4JInput.java | 2 +- .../{inputs => java/main}/Twitch4J/TwitchAccount.java | 2 +- .../{inputs => java/main}/Twitch4J/TwitchAccountRepo.java | 2 +- .../{ => java/main}/modules/core/Twitch4JHandler.java | 0 .../main}/modules/testModule/Core_FollowHandler.java | 0 .../main}/modules/testModule/HookExampleClass.java | 0 .../modules/testModule/resources/templates/test.html | 0 .../main}/modules/testModule/testController.java | 0 src/main/{ => java/main}/system/ASCIIProgressbar.java | 0 src/main/{ => java/main}/system/StopWatch.java | 0 .../main}/system/commandSystem/CommandProcessor.java | 0 .../main}/system/commandSystem/CommandProcessorTest.java | 0 .../main}/system/commandSystem/repositories/Command.java | 0 .../system/commandSystem/repositories/CommandRepo.java | 0 .../system/commandSystem/repositories/CooldownType.java | 0 .../main}/system/commandSystem/repositories/Message.java | 0 .../system/commandSystem/repositories/MessageRepo.java | 0 .../commandSystem/repositories/TPermSetConverter.java | 2 -- .../system/commandSystem/repositories/TwitchUser.java | 0 .../commandSystem/repositories/TwitchUserPermissions.java | 0 .../system/commandSystem/repositories/TwitchUserRepo.java | 0 .../main}/system/eventSystem/EventDispatcher.java | 4 ++-- .../{ => java/main}/system/eventSystem/Subscribe.java | 0 src/main/{ => java/main}/system/hookSystem/Hook.java | 0 .../main}/system/hookSystem/HookMethodRunner.java | 2 +- .../{ => java/main}/system/hookSystem/HookParser.java | 0 src/main/{ => java/main}/system/hookSystem/HookTest.java | 0 src/main/{ => java/main}/system/inputSystem/Input.java | 0 .../{ => java/main}/system/inputSystem/InputManager.java | 0 .../main}/system/inputSystem/TwitchBotInput.java | 0 src/{ => main}/resources/application.properties | 0 src/{ => main}/resources/logback.xml | 8 ++++---- src/resources/META-INF/MANIFEST.MF | 3 --- 34 files changed, 10 insertions(+), 15 deletions(-) rename src/main/{ => java/main}/Application.java (100%) rename src/main/{inputs => java/main}/Twitch4J/Twitch4JInput.java (99%) rename src/main/{inputs => java/main}/Twitch4J/TwitchAccount.java (96%) rename src/main/{inputs => java/main}/Twitch4J/TwitchAccountRepo.java (93%) rename src/main/{ => java/main}/modules/core/Twitch4JHandler.java (100%) rename src/main/{ => java/main}/modules/testModule/Core_FollowHandler.java (100%) rename src/main/{ => java/main}/modules/testModule/HookExampleClass.java (100%) rename src/main/{ => java/main}/modules/testModule/resources/templates/test.html (100%) rename src/main/{ => java/main}/modules/testModule/testController.java (100%) rename src/main/{ => java/main}/system/ASCIIProgressbar.java (100%) rename src/main/{ => java/main}/system/StopWatch.java (100%) rename src/main/{ => java/main}/system/commandSystem/CommandProcessor.java (100%) rename src/main/{ => java/main}/system/commandSystem/CommandProcessorTest.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/Command.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/CommandRepo.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/CooldownType.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/Message.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/MessageRepo.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/TPermSetConverter.java (93%) rename src/main/{ => java/main}/system/commandSystem/repositories/TwitchUser.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/TwitchUserPermissions.java (100%) rename src/main/{ => java/main}/system/commandSystem/repositories/TwitchUserRepo.java (100%) rename src/main/{ => java/main}/system/eventSystem/EventDispatcher.java (94%) rename src/main/{ => java/main}/system/eventSystem/Subscribe.java (100%) rename src/main/{ => java/main}/system/hookSystem/Hook.java (100%) rename src/main/{ => java/main}/system/hookSystem/HookMethodRunner.java (97%) rename src/main/{ => java/main}/system/hookSystem/HookParser.java (100%) rename src/main/{ => java/main}/system/hookSystem/HookTest.java (100%) rename src/main/{ => java/main}/system/inputSystem/Input.java (100%) rename src/main/{ => java/main}/system/inputSystem/InputManager.java (100%) rename src/main/{ => java/main}/system/inputSystem/TwitchBotInput.java (100%) rename src/{ => main}/resources/application.properties (100%) rename src/{ => main}/resources/logback.xml (71%) delete mode 100644 src/resources/META-INF/MANIFEST.MF diff --git a/src/main/Application.java b/src/main/java/main/Application.java similarity index 100% rename from src/main/Application.java rename to src/main/java/main/Application.java diff --git a/src/main/inputs/Twitch4J/Twitch4JInput.java b/src/main/java/main/Twitch4J/Twitch4JInput.java similarity index 99% rename from src/main/inputs/Twitch4J/Twitch4JInput.java rename to src/main/java/main/Twitch4J/Twitch4JInput.java index 46d738d3..ac2cfb90 100644 --- a/src/main/inputs/Twitch4J/Twitch4JInput.java +++ b/src/main/java/main/Twitch4J/Twitch4JInput.java @@ -1,4 +1,4 @@ -package main.inputs.Twitch4J; +package main.Twitch4J; import com.github.philippheuer.credentialmanager.domain.OAuth2Credential; import com.github.philippheuer.events4j.simple.SimpleEventHandler; diff --git a/src/main/inputs/Twitch4J/TwitchAccount.java b/src/main/java/main/Twitch4J/TwitchAccount.java similarity index 96% rename from src/main/inputs/Twitch4J/TwitchAccount.java rename to src/main/java/main/Twitch4J/TwitchAccount.java index 469dc785..c3533162 100644 --- a/src/main/inputs/Twitch4J/TwitchAccount.java +++ b/src/main/java/main/Twitch4J/TwitchAccount.java @@ -1,4 +1,4 @@ -package main.inputs.Twitch4J; +package main.Twitch4J; import jakarta.persistence.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/inputs/Twitch4J/TwitchAccountRepo.java b/src/main/java/main/Twitch4J/TwitchAccountRepo.java similarity index 93% rename from src/main/inputs/Twitch4J/TwitchAccountRepo.java rename to src/main/java/main/Twitch4J/TwitchAccountRepo.java index ff3da993..27b05423 100644 --- a/src/main/inputs/Twitch4J/TwitchAccountRepo.java +++ b/src/main/java/main/Twitch4J/TwitchAccountRepo.java @@ -1,4 +1,4 @@ -package main.inputs.Twitch4J; +package main.Twitch4J; import org.jetbrains.annotations.NotNull; import org.springframework.data.repository.CrudRepository; diff --git a/src/main/modules/core/Twitch4JHandler.java b/src/main/java/main/modules/core/Twitch4JHandler.java similarity index 100% rename from src/main/modules/core/Twitch4JHandler.java rename to src/main/java/main/modules/core/Twitch4JHandler.java diff --git a/src/main/modules/testModule/Core_FollowHandler.java b/src/main/java/main/modules/testModule/Core_FollowHandler.java similarity index 100% rename from src/main/modules/testModule/Core_FollowHandler.java rename to src/main/java/main/modules/testModule/Core_FollowHandler.java diff --git a/src/main/modules/testModule/HookExampleClass.java b/src/main/java/main/modules/testModule/HookExampleClass.java similarity index 100% rename from src/main/modules/testModule/HookExampleClass.java rename to src/main/java/main/modules/testModule/HookExampleClass.java diff --git a/src/main/modules/testModule/resources/templates/test.html b/src/main/java/main/modules/testModule/resources/templates/test.html similarity index 100% rename from src/main/modules/testModule/resources/templates/test.html rename to src/main/java/main/modules/testModule/resources/templates/test.html diff --git a/src/main/modules/testModule/testController.java b/src/main/java/main/modules/testModule/testController.java similarity index 100% rename from src/main/modules/testModule/testController.java rename to src/main/java/main/modules/testModule/testController.java diff --git a/src/main/system/ASCIIProgressbar.java b/src/main/java/main/system/ASCIIProgressbar.java similarity index 100% rename from src/main/system/ASCIIProgressbar.java rename to src/main/java/main/system/ASCIIProgressbar.java diff --git a/src/main/system/StopWatch.java b/src/main/java/main/system/StopWatch.java similarity index 100% rename from src/main/system/StopWatch.java rename to src/main/java/main/system/StopWatch.java diff --git a/src/main/system/commandSystem/CommandProcessor.java b/src/main/java/main/system/commandSystem/CommandProcessor.java similarity index 100% rename from src/main/system/commandSystem/CommandProcessor.java rename to src/main/java/main/system/commandSystem/CommandProcessor.java diff --git a/src/main/system/commandSystem/CommandProcessorTest.java b/src/main/java/main/system/commandSystem/CommandProcessorTest.java similarity index 100% rename from src/main/system/commandSystem/CommandProcessorTest.java rename to src/main/java/main/system/commandSystem/CommandProcessorTest.java diff --git a/src/main/system/commandSystem/repositories/Command.java b/src/main/java/main/system/commandSystem/repositories/Command.java similarity index 100% rename from src/main/system/commandSystem/repositories/Command.java rename to src/main/java/main/system/commandSystem/repositories/Command.java diff --git a/src/main/system/commandSystem/repositories/CommandRepo.java b/src/main/java/main/system/commandSystem/repositories/CommandRepo.java similarity index 100% rename from src/main/system/commandSystem/repositories/CommandRepo.java rename to src/main/java/main/system/commandSystem/repositories/CommandRepo.java diff --git a/src/main/system/commandSystem/repositories/CooldownType.java b/src/main/java/main/system/commandSystem/repositories/CooldownType.java similarity index 100% rename from src/main/system/commandSystem/repositories/CooldownType.java rename to src/main/java/main/system/commandSystem/repositories/CooldownType.java diff --git a/src/main/system/commandSystem/repositories/Message.java b/src/main/java/main/system/commandSystem/repositories/Message.java similarity index 100% rename from src/main/system/commandSystem/repositories/Message.java rename to src/main/java/main/system/commandSystem/repositories/Message.java diff --git a/src/main/system/commandSystem/repositories/MessageRepo.java b/src/main/java/main/system/commandSystem/repositories/MessageRepo.java similarity index 100% rename from src/main/system/commandSystem/repositories/MessageRepo.java rename to src/main/java/main/system/commandSystem/repositories/MessageRepo.java diff --git a/src/main/system/commandSystem/repositories/TPermSetConverter.java b/src/main/java/main/system/commandSystem/repositories/TPermSetConverter.java similarity index 93% rename from src/main/system/commandSystem/repositories/TPermSetConverter.java rename to src/main/java/main/system/commandSystem/repositories/TPermSetConverter.java index 34941f74..aff8fa61 100644 --- a/src/main/system/commandSystem/repositories/TPermSetConverter.java +++ b/src/main/java/main/system/commandSystem/repositories/TPermSetConverter.java @@ -2,10 +2,8 @@ import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; -import main.system.commandSystem.repositories.TwitchUserPermissions; import java.util.HashSet; -import java.util.List; import java.util.StringJoiner; @Converter diff --git a/src/main/system/commandSystem/repositories/TwitchUser.java b/src/main/java/main/system/commandSystem/repositories/TwitchUser.java similarity index 100% rename from src/main/system/commandSystem/repositories/TwitchUser.java rename to src/main/java/main/system/commandSystem/repositories/TwitchUser.java diff --git a/src/main/system/commandSystem/repositories/TwitchUserPermissions.java b/src/main/java/main/system/commandSystem/repositories/TwitchUserPermissions.java similarity index 100% rename from src/main/system/commandSystem/repositories/TwitchUserPermissions.java rename to src/main/java/main/system/commandSystem/repositories/TwitchUserPermissions.java diff --git a/src/main/system/commandSystem/repositories/TwitchUserRepo.java b/src/main/java/main/system/commandSystem/repositories/TwitchUserRepo.java similarity index 100% rename from src/main/system/commandSystem/repositories/TwitchUserRepo.java rename to src/main/java/main/system/commandSystem/repositories/TwitchUserRepo.java diff --git a/src/main/system/eventSystem/EventDispatcher.java b/src/main/java/main/system/eventSystem/EventDispatcher.java similarity index 94% rename from src/main/system/eventSystem/EventDispatcher.java rename to src/main/java/main/system/eventSystem/EventDispatcher.java index 88007b62..155ee09e 100644 --- a/src/main/system/eventSystem/EventDispatcher.java +++ b/src/main/java/main/system/eventSystem/EventDispatcher.java @@ -28,8 +28,8 @@ public static void main(String[] args) throws InvocationTargetException, Illegal private static final Set eventHandler = scanForSubscriber(); private static Set scanForSubscriber() { -// Reflections reflections = new Reflections("main.modules", Scanners.MethodsAnnotated); - Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.modules").addScanners(Scanners.MethodsAnnotated)); +// Reflections reflections = new Reflections("main.main.modules", Scanners.MethodsAnnotated); + Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.main.modules").addScanners(Scanners.MethodsAnnotated)); Set methods = reflections.getMethodsAnnotatedWith(Subscribe.class); //Die Methoden müssen static sein und dürfen nur einen Parameter haben, // und dieser Parameter muss gleich mit der Klasse in der Annotation sein diff --git a/src/main/system/eventSystem/Subscribe.java b/src/main/java/main/system/eventSystem/Subscribe.java similarity index 100% rename from src/main/system/eventSystem/Subscribe.java rename to src/main/java/main/system/eventSystem/Subscribe.java diff --git a/src/main/system/hookSystem/Hook.java b/src/main/java/main/system/hookSystem/Hook.java similarity index 100% rename from src/main/system/hookSystem/Hook.java rename to src/main/java/main/system/hookSystem/Hook.java diff --git a/src/main/system/hookSystem/HookMethodRunner.java b/src/main/java/main/system/hookSystem/HookMethodRunner.java similarity index 97% rename from src/main/system/hookSystem/HookMethodRunner.java rename to src/main/java/main/system/hookSystem/HookMethodRunner.java index b1fb8098..94b602c8 100644 --- a/src/main/system/hookSystem/HookMethodRunner.java +++ b/src/main/java/main/system/hookSystem/HookMethodRunner.java @@ -47,7 +47,7 @@ private static String invokeHookMethod(Method method, Message message, HashMap scanForHooks() { - Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.modules").addScanners(Scanners.MethodsAnnotated)); + Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("main.main.modules").addScanners(Scanners.MethodsAnnotated)); Set methods = reflections.getMethodsAnnotatedWith(Hook.class); //Die Methoden müssen static sein und müssen als ersten Parameter die message haben und danach eine beliebige Anzahl von Strings Set collect = methods.stream() diff --git a/src/main/system/hookSystem/HookParser.java b/src/main/java/main/system/hookSystem/HookParser.java similarity index 100% rename from src/main/system/hookSystem/HookParser.java rename to src/main/java/main/system/hookSystem/HookParser.java diff --git a/src/main/system/hookSystem/HookTest.java b/src/main/java/main/system/hookSystem/HookTest.java similarity index 100% rename from src/main/system/hookSystem/HookTest.java rename to src/main/java/main/system/hookSystem/HookTest.java diff --git a/src/main/system/inputSystem/Input.java b/src/main/java/main/system/inputSystem/Input.java similarity index 100% rename from src/main/system/inputSystem/Input.java rename to src/main/java/main/system/inputSystem/Input.java diff --git a/src/main/system/inputSystem/InputManager.java b/src/main/java/main/system/inputSystem/InputManager.java similarity index 100% rename from src/main/system/inputSystem/InputManager.java rename to src/main/java/main/system/inputSystem/InputManager.java diff --git a/src/main/system/inputSystem/TwitchBotInput.java b/src/main/java/main/system/inputSystem/TwitchBotInput.java similarity index 100% rename from src/main/system/inputSystem/TwitchBotInput.java rename to src/main/java/main/system/inputSystem/TwitchBotInput.java diff --git a/src/resources/application.properties b/src/main/resources/application.properties similarity index 100% rename from src/resources/application.properties rename to src/main/resources/application.properties diff --git a/src/resources/logback.xml b/src/main/resources/logback.xml similarity index 71% rename from src/resources/logback.xml rename to src/main/resources/logback.xml index 24349869..deeec68a 100644 --- a/src/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/src/resources/META-INF/MANIFEST.MF b/src/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 8983f06c..00000000 --- a/src/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: main.Application - From a29dabb31e79c73f4c2b068d68acf31dcf55de62 Mon Sep 17 00:00:00 2001 From: leonbcode Date: Mon, 13 Feb 2023 18:16:34 +0100 Subject: [PATCH 07/12] packaging via spring boot --- build.gradle | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 2ae93a04..d668689c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,4 @@ plugins { - id 'java-library' - id 'maven-publish' - id 'com.github.johnrengelman.shadow' version '7.1.2' id 'org.springframework.boot' version '3.0.2' } @@ -16,15 +13,15 @@ repositories { } dependencies { - api 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.1' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.1' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - api 'org.springframework:spring-beans:6.0.3' - api 'org.reflections:reflections:0.10.2' - api 'com.github.twitch4j:twitch4j:1.12.0' - api 'ch.qos.logback:logback-classic:1.4.5' - api 'org.springframework:spring-jdbc:5.3.23' - api 'org.junit.jupiter:junit-jupiter-api:5.9.1' + implementation 'org.springframework:spring-jdbc:5.3.23' + implementation 'org.springframework:spring-beans:6.0.3' + implementation 'org.reflections:reflections:0.10.2' + implementation 'com.github.twitch4j:twitch4j:1.13.0' + implementation 'ch.qos.logback:logback-classic:1.4.5' + implementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' runtimeOnly 'org.springframework.boot:spring-boot-devtools:3.0.1' runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.9' testImplementation 'org.springframework.boot:spring-boot-starter-test:3.0.1' @@ -35,14 +32,6 @@ version = '0.0.1-SNAPSHOT' description = 'JavaTwitchBot' java.sourceCompatibility = JavaVersion.VERSION_17 -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } From aebc16f4546037a5c754a4f61ea817f459382694 Mon Sep 17 00:00:00 2001 From: leonbcode Date: Mon, 13 Feb 2023 18:17:24 +0100 Subject: [PATCH 08/12] fix package name --- src/main/resources/logback.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index deeec68a..24349869 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -13,10 +13,10 @@ - - - - + + + + From 28363b0b3ff7e790a263864b025cb89d07434e41 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 18:53:47 +0100 Subject: [PATCH 09/12] use gradle-build-action to improve buildtimes --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91782992..53c69d64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,9 +14,7 @@ jobs: java-version: 17 distribution: 'adopt' cache: gradle - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Build with Gradle - run: sudo chmod +x gradlew && ./gradlew build - - name: Compile code - run: ./gradlew shadowJar \ No newline at end of file + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Run build with Gradle Wrapper + run: ./gradlew build From ffef03fb3bf86fcb2506773336e458d7249b97f5 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 18:55:51 +0100 Subject: [PATCH 10/12] fix missing permissions on gradle build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53c69d64..95ba26fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,4 +17,4 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Run build with Gradle Wrapper - run: ./gradlew build + run: sudo chmod +x gradlew && ./gradlew build From b60d8a40c5a5121d132ff7df46e2914656a46e6b Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 19:04:17 +0100 Subject: [PATCH 11/12] specify gradle version in build action --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95ba26fa..7af21b63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,5 +16,7 @@ jobs: cache: gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.6 - name: Run build with Gradle Wrapper run: sudo chmod +x gradlew && ./gradlew build From 55f8fd648ca6e93190ef86e5ec288f3b5d807495 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 19:06:51 +0100 Subject: [PATCH 12/12] use cached gradle wrapper --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7af21b63..28809efe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,4 +19,4 @@ jobs: with: gradle-version: 7.6 - name: Run build with Gradle Wrapper - run: sudo chmod +x gradlew && ./gradlew build + run: gradle build