build: update dependencies

This commit is contained in:
Gauthier Roebroeck 2020-03-05 17:26:47 +08:00
parent 46a0a35aa8
commit 11fbdcf47c
6 changed files with 24 additions and 26 deletions

View file

@ -1,4 +1,4 @@
tasks.wrapper { tasks.wrapper {
gradleVersion = "6.2" gradleVersion = "6.2.2"
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
} }

Binary file not shown.

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.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

29
gradlew vendored
View file

@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=$((i+1)) i=`expr $i + 1`
done done
case $i in case $i in
(0) set -- ;; 0) set -- ;;
(1) set -- "$args0" ;; 1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;; 2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;; 3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=$(save "$@") APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

3
gradlew.bat vendored
View file

@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
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="-Xmx64m" "-Xms64m"

View file

@ -4,18 +4,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
run { run {
val kotlinVersion = "1.3.61" val kotlinVersion = "1.3.70"
kotlin("jvm") version kotlinVersion kotlin("jvm") version kotlinVersion
kotlin("plugin.allopen") version kotlinVersion kotlin("plugin.allopen") version kotlinVersion
kotlin("plugin.spring") version kotlinVersion kotlin("plugin.spring") version kotlinVersion
kotlin("plugin.jpa") version kotlinVersion kotlin("plugin.jpa") version kotlinVersion
kotlin("kapt") version kotlinVersion kotlin("kapt") version kotlinVersion
} }
id("org.springframework.boot") version "2.2.4.RELEASE" id("org.springframework.boot") version "2.2.5.RELEASE"
id("io.spring.dependency-management") version "1.0.9.RELEASE" id("io.spring.dependency-management") version "1.0.9.RELEASE"
id("com.github.ben-manes.versions") version "0.27.0" id("com.github.ben-manes.versions") version "0.28.0"
id("com.palantir.docker") version "0.25.0" id("com.palantir.docker") version "0.25.0"
id("com.gorylenko.gradle-git-properties") version "2.2.1" id("com.gorylenko.gradle-git-properties") version "2.2.2"
jacoco jacoco
} }
@ -69,10 +69,10 @@ dependencies {
implementation("org.apache.tika:tika-core:1.23") implementation("org.apache.tika:tika-core:1.23")
implementation("org.apache.commons:commons-compress:1.20") implementation("org.apache.commons:commons-compress:1.20")
implementation("com.github.junrar:junrar:4.0.0") implementation("com.github.junrar:junrar:4.0.0")
implementation("org.apache.pdfbox:pdfbox:2.0.18") implementation("org.apache.pdfbox:pdfbox:2.0.19")
implementation("net.grey-panther:natural-comparator:1.1") implementation("net.grey-panther:natural-comparator:1.1")
implementation("net.coobird:thumbnailator:0.4.9") implementation("net.coobird:thumbnailator:0.4.11")
implementation("com.twelvemonkeys.imageio:imageio-jpeg:3.5") implementation("com.twelvemonkeys.imageio:imageio-jpeg:3.5")
implementation("com.twelvemonkeys.imageio:imageio-tiff:3.5") implementation("com.twelvemonkeys.imageio:imageio-tiff:3.5")
implementation(files("$projectDir/libs/webp-imageio-decoder-plugin-0.2.jar")) implementation(files("$projectDir/libs/webp-imageio-decoder-plugin-0.2.jar"))
@ -92,7 +92,7 @@ dependencies {
testImplementation("io.mockk:mockk:1.9.3") testImplementation("io.mockk:mockk:1.9.3")
testImplementation("com.google.jimfs:jimfs:1.1") testImplementation("com.google.jimfs:jimfs:1.1")
testCompile("com.tngtech.archunit:archunit-junit5:0.13.1") testImplementation("com.tngtech.archunit:archunit-junit5:0.13.1")
developmentOnly("org.springframework.boot:spring-boot-devtools") developmentOnly("org.springframework.boot:spring-boot-devtools")
} }