Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexProgrammerDE committed Aug 23, 2024
2 parents 98b8520 + 97b5389 commit 3a80288
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /mojangapi
RUN --mount=type=cache,target=/root/.gradle,sharing=locked --mount=type=cache,target=/mojangapi/.gradle,sharing=locked --mount=type=cache,target=/mojangapi/work,sharing=locked \
./gradlew build --stacktrace

FROM eclipse-temurin:21.0.3_9-jdk-alpine AS jre-no-javac-builder
FROM eclipse-temurin:21.0.4_7-jdk-alpine AS jre-no-javac-builder

# Install necessery dependencies
RUN apk add --no-progress --no-cache binutils tzdata
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# mojang-api

Mojang API proxy with automatic caching.
Public Mojang API proxy with automatic caching.
See https://eclipse.skinsrestorer.net/docs/ for usage & documentation

## Sysctl

Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ plugins {
id 'java'
id 'eclipse'
id 'idea'
id "io.spring.dependency-management" version "1.1.5"
id "io.freefair.lombok" version "8.6"
id "io.spring.dependency-management" version "1.1.6"
id "io.freefair.lombok" version "8.10"
}

repositories {
Expand All @@ -14,19 +14,19 @@ repositories {

dependencyManagement {
imports {
mavenBom 'io.micrometer:micrometer-bom:1.13.1'
mavenBom 'io.netty:netty-bom:4.1.111.Final'
mavenBom 'com.linecorp.armeria:armeria-bom:1.29.1'
mavenBom 'io.micrometer:micrometer-bom:1.13.3'
mavenBom 'io.netty:netty-bom:4.1.112.Final'
mavenBom 'com.linecorp.armeria:armeria-bom:1.30.0'
mavenBom 'io.github.resilience4j:resilience4j-bom:2.2.0'
}
}

dependencies {
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'com.linecorp.armeria:armeria'
runtimeOnly 'org.slf4j:slf4j-simple:2.0.13'
implementation "io.projectreactor.netty:reactor-netty-core:1.1.20"
implementation "io.projectreactor.netty:reactor-netty-http:1.1.20"
runtimeOnly 'org.slf4j:slf4j-simple:2.0.16'
implementation "io.projectreactor.netty:reactor-netty-core:1.1.22"
implementation "io.projectreactor.netty:reactor-netty-http:1.1.22"
implementation 'com.google.code.gson:gson:2.11.0'
implementation 'org.postgresql:r2dbc-postgresql:1.0.5.RELEASE'
implementation 'io.r2dbc:r2dbc-pool:1.0.1.RELEASE'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
db:
image: postgres:16.3-alpine
image: postgres:16.4-alpine
restart: always
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit 3a80288

Please sign in to comment.