Enhance CI, JitPack, Gradle 8.5, paste.gg -> mclo.gs and dependency updates.

This commit is contained in:
Kichura 2024-01-19 23:01:15 +01:00 committed by GitHub
parent 2ea6406db5
commit b99971194d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 35 additions and 37 deletions

View File

@ -23,12 +23,12 @@ body:
attributes: attributes:
label: Console Error label: Console Error
description: | description: |
If you encounter warnings/errors in your console, **paste them with https://paste.gg/ and put the paste link here**. If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**.
If the error is small/less than 10 lines, you may put it directly into this field. If the error is small/less than 10 lines, you may put it directly into this field.
There may be some additional information in ``logs/debug.log`` There may be some additional information in ``logs/debug.log``
value: | value: |
``` ```
Put the paste.gg link or text here. Put the mclo.gs link or text here.
``` ```
placeholder: Please do not remove the grave accents; simply replace the line of text in the middle. placeholder: Please do not remove the grave accents; simply replace the line of text in the middle.
validations: validations:

View File

@ -5,14 +5,15 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: 17 java-version: 17
check-latest: true
- name: Cache Dependencies - name: Cache Dependencies
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/.gradle/ path: ~/.gradle/
key: ${{ runner.os }}-build-aspirin-${{ hashFiles('**/build.gradle.kts') }} key: ${{ runner.os }}-build-aspirin-${{ hashFiles('**/build.gradle.kts') }}
@ -21,7 +22,7 @@ jobs:
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew build run: ./gradlew build
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: artifact name: artifact
path: build/libs/ path: build/libs/

View File

@ -9,15 +9,15 @@ import java.nio.file.Files as JFiles
buildscript { buildscript {
repositories { mavenCentral() } repositories { mavenCentral() }
dependencies { classpath("com.github.hazendaz:htmlcompressor:1.9.1") } dependencies { classpath("com.github.hazendaz:htmlcompressor:2.0.0") }
} }
plugins { plugins {
`java-library` `java-library`
application application
kotlin("jvm") version "1.9.10" kotlin("jvm") version "1.9.22"
id("maven-publish") id("maven-publish")
id("com.github.ben-manes.versions") version "0.47.0" id("com.github.ben-manes.versions") version "0.50.0"
id("com.github.johnrengelman.shadow") version "8.1.1" id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.palantir.git-version") version "3.0.0" id("com.palantir.git-version") version "3.0.0"
id("org.gradlewebtools.minify") version "1.3.2" apply false id("org.gradlewebtools.minify") version "1.3.2" apply false
@ -62,7 +62,7 @@ dependencies {
val vvVer = "4.9.3-SNAPSHOT" val vvVer = "4.9.3-SNAPSHOT"
val vbVer = "4.9.2-SNAPSHOT" val vbVer = "4.9.2-SNAPSHOT"
val vrVer = "3.0.5" val vrVer = "3.0.6-SNAPSHOT"
implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false } implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false }
implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false } implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false }
implementation("com.viaversion:viarewind-universal:$vrVer") { isTransitive = false } implementation("com.viaversion:viarewind-universal:$vrVer") { isTransitive = false }
@ -85,18 +85,18 @@ dependencies {
implementation("org.powernukkit.fastutil:fastutil-lite:8.1.1") implementation("org.powernukkit.fastutil:fastutil-lite:8.1.1")
implementation("org.yaml:snakeyaml:2.2") implementation("org.yaml:snakeyaml:2.2")
val log4jVer = "2.20.0" val log4jVer = "2.22.1"
val slf4jVer = "2.0.9" val slf4jVer = "2.0.11"
implementation("com.lmax:disruptor:3.4.4") implementation("com.lmax:disruptor:4.0.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.minecrell:terminalconsoleappender:1.3.0")
implementation("org.apache.logging.log4j:log4j-core:$log4jVer") implementation("org.apache.logging.log4j:log4j-core:$log4jVer")
implementation("org.apache.logging.log4j:log4j-iostreams:$log4jVer") implementation("org.apache.logging.log4j:log4j-iostreams:$log4jVer")
implementation("org.apache.logging.log4j:log4j-jul:$log4jVer") implementation("org.apache.logging.log4j:log4j-jul:$log4jVer")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVer") implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVer")
implementation("org.jline:jline-terminal-jansi:3.23.0") implementation("org.jline:jline-terminal-jansi:3.25.0")
implementation("org.slf4j:slf4j-api:$slf4jVer") implementation("org.slf4j:slf4j-api:$slf4jVer")
val ktorVersion = "2.3.5" val ktorVersion = "2.3.7"
implementation("io.ktor:ktor-network-tls-certificates-jvm:$ktorVersion") implementation("io.ktor:ktor-network-tls-certificates-jvm:$ktorVersion")
implementation("io.ktor:ktor-server-websockets:$ktorVersion") implementation("io.ktor:ktor-server-websockets:$ktorVersion")
implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion") implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion")

Binary file not shown.

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

4
gradlew vendored
View File

@ -200,7 +200,7 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # 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"' DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
@ -246,4 +246,4 @@ eval "set -- $(
tr '\n' ' ' tr '\n' ' '
)" '"$@"' )" '"$@"'
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

24
gradlew.bat vendored
View File

@ -34,7 +34,7 @@ set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi 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. @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" set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega

View File

@ -1,7 +1,4 @@
jdk:
- temurinjdk17
before_install: before_install:
- curl -s "https://get.sdkman.io" | bash - curl -s "https://get.sdkman.io" | bash
- source "$HOME/.sdkman/bin/sdkman-init.sh" - source ~/.sdkman/bin/sdkman-init.sh
- sdk install java 17.0.8+7-tem - sdk install java 17.0.10-tem
- sdk use java 17.0.8+7-tem

View File

@ -1,3 +1,3 @@
plugins { plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
} }