Gradle Updatings, Friendly names in CI, Update JDK in jitpack. (#230)

* Gradle Updatings, Friendly names in CI, Update JDK in jitpack.

* Update HTMLCompressor to 1.9.1.

* Update guava.

* Ensure minemen is blacklisted.
This commit is contained in:
Kichura 2023-06-20 18:25:54 +02:00 committed by GitHub
parent dc75958055
commit ae05cc77c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 26 deletions

View File

@ -1,24 +1,27 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
name: Gradle build
name: Java CI with Gradle
on: [ push, pull_request ]
jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- name: Checkout Repository
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
- uses: actions/cache@v3
- name: Cache Dependencies
uses: actions/cache@v3
with:
path: ~/.gradle/
key: ${{ runner.os }}-build-aspirin-${{ hashFiles('**/build.gradle.kts') }}
restore-keys: |
${{ runner.os }}-build-aspirin-
- run: ./gradlew build
- uses: actions/upload-artifact@v3
- name: Build with Gradle
run: ./gradlew build
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: artifact
path: build/libs/

View File

@ -9,7 +9,7 @@ import java.nio.file.Files as JFiles
buildscript {
repositories { mavenCentral() }
dependencies { classpath("com.github.hazendaz:htmlcompressor:1.8.0") }
dependencies { classpath("com.github.hazendaz:htmlcompressor:1.9.1") }
}
plugins {
@ -17,9 +17,9 @@ plugins {
application
kotlin("jvm") version "1.8.10"
id("maven-publish")
id("com.github.ben-manes.versions") version "0.46.0"
id("com.github.johnrengelman.shadow") version "8.1.0"
id("com.palantir.git-version") version "2.0.0"
id("com.github.ben-manes.versions") version "0.47.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.palantir.git-version") version "3.0.0"
id("org.gradlewebtools.minify") version "1.3.2" apply false
}
@ -69,24 +69,24 @@ dependencies {
implementation("net.raphimc:ViaAprilFools:2.0.8-SNAPSHOT")
implementation("net.raphimc:ViaLegacy:2.2.18-SNAPSHOT")
val nettyVer = "4.1.91.Final"
val nettyVer = "4.1.93.Final"
implementation("io.netty:netty-handler-proxy:$nettyVer")
implementation("io.netty:netty-resolver-dns:$nettyVer")
implementation("io.netty:netty-transport-native-epoll:$nettyVer:linux-aarch_64")
implementation("io.netty:netty-transport-native-epoll:$nettyVer:linux-x86_64")
implementation("io.netty:netty-tcnative-boringssl-static:2.0.59.Final:linux-aarch_64")
implementation("io.netty:netty-tcnative-boringssl-static:2.0.59.Final:linux-x86_64")
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.19.Final:linux-aarch_64")
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.19.Final:linux-x86_64")
implementation("io.netty:netty-tcnative-boringssl-static:2.0.61.Final:linux-aarch_64")
implementation("io.netty:netty-tcnative-boringssl-static:2.0.61.Final:linux-x86_64")
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.21.Final:linux-aarch_64")
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.21.Final:linux-x86_64")
implementation("com.google.guava:guava:31.1-jre")
implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT")
implementation("com.google.guava:guava:32.0.1-jre")
implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT")
implementation("net.coobird:thumbnailator:0.4.19")
implementation("org.powernukkit.fastutil:fastutil-lite:8.1.1")
implementation("org.yaml:snakeyaml:2.0")
val log4jVer = "2.20.0"
val slf4jVer = "2.0.6"
val slf4jVer = "2.0.7"
implementation("com.lmax:disruptor:3.4.4")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
implementation("org.apache.logging.log4j:log4j-core:$log4jVer")
@ -114,7 +114,7 @@ dependencies {
implementation("io.ktor:ktor-client-logging-jvm:$ktorVersion")
testImplementation("io.ktor:ktor-server-test-host-jvm:$ktorVersion")
implementation("com.auth0:java-jwt:4.3.0")
implementation("com.auth0:java-jwt:4.4.0")
}
val run: JavaExec by tasks

Binary file not shown.

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@ -1,5 +1,5 @@
jdk:
- temurinjdk17
before_install:
- sdk install java 17.0.5+8-tem
- sdk use java 17.0.5+8-tem
- sdk install java 17.0.7+7-tem
- sdk use java 17.0.7+7-tem

View File

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

View File

@ -45,6 +45,7 @@ block-local-address: true
# If some server is in this list, it will be blocked.
blocked-back-addresses:
- "*.hypixel.net"
- "*.minemen.club"
# Only allows the backend address if it matches an address in this list.
allowed-back-addresses:
- "*"
@ -94,4 +95,4 @@ backend-socks5-proxy-address: ''
backend-socks5-proxy-port: 9050
backend-address: ''
bind-address: ''
port: ''
port: ''