Update dependencies and increment versions

This commit is contained in:
aNNiMON 2023-10-27 22:31:24 +03:00
parent fc85c886c1
commit 937103be94
3 changed files with 12 additions and 11 deletions

View File

@ -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 RUN mkdir -p /home/gradle/cache_home
ENV GRADLE_USER_HOME=/home/gradle/cache_home ENV GRADLE_USER_HOME=/home/gradle/cache_home
COPY build.gradle /home/gradle/java-code/ COPY build.gradle /home/gradle/java-code/
WORKDIR /home/gradle/java-code WORKDIR /home/gradle/java-code
RUN GRADLE_OPTS="-Xmx256m" gradle build --build-cache --stacktrace -i --no-daemon 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 --from=cache /home/gradle/cache_home /home/gradle/.gradle
COPY . /usr/src/java-code COPY . /usr/src/java-code
WORKDIR /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 FROM openjdk:11
WORKDIR /app 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 '' \ ENV BOT_TOKEN '' \
ADMIN_ID 0 \ ADMIN_ID 0 \
MODE 'once' MODE 'once'
ENTRYPOINT ["java", "-jar", "/app/SimilarImagesBot-1.0.3-all.jar"] ENTRYPOINT ["java", "-jar", "/app/SimilarImagesBot-1.0.4-all.jar"]

View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.github.johnrengelman.shadow" version "6.0.0" id "com.github.johnrengelman.shadow" version "8.1.1"
id 'java' id 'java'
id 'application' id 'application'
} }
@ -8,7 +8,7 @@ sourceCompatibility = 11
targetCompatibility = 11 targetCompatibility = 11
mainClassName = 'com.annimon.similarimagesbot.Main' mainClassName = 'com.annimon.similarimagesbot.Main'
group 'com.annimon' group 'com.annimon'
version '1.0.3' version '1.0.4'
repositories { repositories {
jcenter() jcenter()
@ -16,15 +16,16 @@ repositories {
} }
dependencies { 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.github.kilianB:JImageHash:3.0.0'
implementation 'com.h2database:h2:1.4.200' implementation 'com.h2database:h2:1.4.200'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1' 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.dataformat:jackson-dataformat-yaml:2.15.3'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1' 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 { shadowJar {

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists