From 937103be94aee9006beb9f8398d82438920a6a37 Mon Sep 17 00:00:00 2001 From: aNNiMON Date: Fri, 27 Oct 2023 22:31:24 +0300 Subject: [PATCH] Update dependencies and increment versions --- Dockerfile | 8 ++++---- build.gradle | 13 +++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f720b6..597154e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM gradle:6.6.1-jdk11 AS cache +FROM gradle:8.2-jdk11 AS cache RUN mkdir -p /home/gradle/cache_home ENV GRADLE_USER_HOME=/home/gradle/cache_home COPY build.gradle /home/gradle/java-code/ WORKDIR /home/gradle/java-code RUN GRADLE_OPTS="-Xmx256m" gradle build --build-cache --stacktrace -i --no-daemon -FROM gradle:6.6.1-jdk11 as builder +FROM gradle:8.2-jdk11 as builder COPY --from=cache /home/gradle/cache_home /home/gradle/.gradle COPY . /usr/src/java-code WORKDIR /usr/src/java-code @@ -13,8 +13,8 @@ RUN GRADLE_OPTS="-Xmx256m" gradle shadowJar --build-cache --stacktrace --no-daem FROM openjdk:11 WORKDIR /app -COPY --from=builder /usr/src/java-code/build/libs/SimilarImagesBot-1.0.3-all.jar . +COPY --from=builder /usr/src/java-code/build/libs/SimilarImagesBot-1.0.4-all.jar . ENV BOT_TOKEN '' \ ADMIN_ID 0 \ MODE 'once' -ENTRYPOINT ["java", "-jar", "/app/SimilarImagesBot-1.0.3-all.jar"] +ENTRYPOINT ["java", "-jar", "/app/SimilarImagesBot-1.0.4-all.jar"] diff --git a/build.gradle b/build.gradle index 832829a..5f6fe53 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "6.0.0" + id "com.github.johnrengelman.shadow" version "8.1.1" id 'java' id 'application' } @@ -8,7 +8,7 @@ sourceCompatibility = 11 targetCompatibility = 11 mainClassName = 'com.annimon.similarimagesbot.Main' group 'com.annimon' -version '1.0.3' +version '1.0.4' repositories { jcenter() @@ -16,15 +16,16 @@ repositories { } dependencies { - implementation 'com.github.pengrad:java-telegram-bot-api:5.5.0' + implementation 'com.github.pengrad:java-telegram-bot-api:6.9.1' implementation 'com.github.kilianB:JImageHash:3.0.0' implementation 'com.h2database:h2:1.4.200' implementation 'org.apache.logging.log4j:log4j-core:2.17.1' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1' - implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3' + implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3' - testCompile 'junit:junit:4.13.2' + testImplementation platform("org.junit:junit-bom:5.9.2") + testImplementation 'org.junit.jupiter:junit-jupiter' } shadowJar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..15de902 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists