diff --git a/build.gradle.kts b/build.gradle.kts index 09b633561..738ba393f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ tasks.wrapper { - gradleVersion = "6.2" + gradleVersion = "6.2.2" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf01..f3d88b1c2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 842267020..84a906615 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.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 83f2acfdc..2fe81a7d9 100755 --- a/gradlew +++ b/gradlew @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # 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" -# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d96..62bd9b9cc 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 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. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" diff --git a/komga/build.gradle.kts b/komga/build.gradle.kts index af493dd0a..cdd29347d 100644 --- a/komga/build.gradle.kts +++ b/komga/build.gradle.kts @@ -4,18 +4,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { run { - val kotlinVersion = "1.3.61" + val kotlinVersion = "1.3.70" kotlin("jvm") version kotlinVersion kotlin("plugin.allopen") version kotlinVersion kotlin("plugin.spring") version kotlinVersion kotlin("plugin.jpa") 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("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.gorylenko.gradle-git-properties") version "2.2.1" + id("com.gorylenko.gradle-git-properties") version "2.2.2" jacoco } @@ -69,10 +69,10 @@ dependencies { implementation("org.apache.tika:tika-core:1.23") implementation("org.apache.commons:commons-compress:1.20") 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.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-tiff:3.5") implementation(files("$projectDir/libs/webp-imageio-decoder-plugin-0.2.jar")) @@ -92,7 +92,7 @@ dependencies { testImplementation("io.mockk:mockk:1.9.3") 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") }