Merge pull request #371 from Myself5/gradle-7.1-update

crowdin-cli: Update subdependencies and code for Gradle 7.1
crowdin · Jun 30, 2021 · 3892207 · 3892207
2 parents 7f74275 + ecbb381
commit 3892207
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 80 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,9 +2,9 @@ import com.github.spotbugs.snom.SpotBugsReport
 
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '6.0.0'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
     id 'jacoco'
-    id "com.github.spotbugs" version "4.4.4"
+    id "com.github.spotbugs" version "4.7.1"
 }
 
 apply plugin: 'checkstyle'
@@ -24,45 +24,45 @@ repositories {
     mavenCentral()
     maven { url 'https://jitpack.io'}
     maven {
-        url "http://repo1.maven.org/maven2"
+        url "https://repo1.maven.org/maven2"
     }
 }
 
 dependencies {
-    implementation 'org.json:json:20160212'
-    implementation 'commons-cli:commons-cli:1.3.1'
-    implementation 'org.apache.logging.log4j:log4j-api:2.5'
-    implementation 'org.apache.logging.log4j:log4j-core:2.5'
-    implementation 'org.yaml:snakeyaml:1.17'
-    implementation 'commons-io:commons-io:2.5'
-
-    implementation 'org.glassfish.jersey.core:jersey-client:2.28'
-    implementation 'org.glassfish.jersey.inject:jersey-hk2:2.28'
-    implementation 'org.glassfish.jersey.media:jersey-media-multipart:2.28'
+    implementation 'org.json:json:20210307'
+    implementation 'commons-cli:commons-cli:1.4'
+    implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
+    implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
+    implementation 'org.yaml:snakeyaml:1.29'
+    implementation 'commons-io:commons-io:2.10.0'
+
+    implementation 'org.glassfish.jersey.core:jersey-client:3.0.2'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.2'
+    implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.0.2'
     implementation 'javax.activation:activation:1.1.1'
 
-    implementation 'org.apache.commons:commons-lang3:3.4'
-    implementation 'net.lingala.zip4j:zip4j:1.3.2'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'net.lingala.zip4j:zip4j:2.8.0'
     implementation 'net.ricecode:string-similarity:1.0.0'
     implementation 'com.github.fge:json-patch:1.9'
-    compile 'io.github.cdimascio:dotenv-java:2.2.0'
+    implementation 'io.github.cdimascio:dotenv-java:2.2.0'
 
-    implementation 'org.apache.httpcomponents:httpclient:4.5.3'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    compileOnly 'org.projectlombok:lombok:1.18.12'
-    annotationProcessor 'org.projectlombok:lombok:1.18.12'
-    testCompileOnly 'org.projectlombok:lombok:1.18.12'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
+    compileOnly 'org.projectlombok:lombok:1.18.20'
+    annotationProcessor 'org.projectlombok:lombok:1.18.20'
+    testCompileOnly 'org.projectlombok:lombok:1.18.20'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
     implementation 'info.picocli:picocli:4.6.1'
 
     implementation 'com.github.crowdin:crowdin-api-client-java:1.3.4'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
     testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.mockito:mockito-core:2.1.0'
+    testImplementation 'org.mockito:mockito-core:3.11.2'
 
-    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
+    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
 }
 
 jar {
@@ -88,14 +88,14 @@ test {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
-    reportsDir = file("$buildDir/reports")
+    toolVersion = "0.8.7"
+    reportsDirectory = file("$buildDir/reports")
 }
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        csv.enabled false
+        xml.required = true
+        csv.required = false
         xml.destination file("${buildDir}/coverage.xml")
     }
 
@@ -114,7 +114,7 @@ spotbugsMain {
     onlyIf {project.hasProperty('staticAnalysisMarker')}
     reports(({
         html {
-            enabled = true
+            required = true
             destination = file("$buildDir/reports/staticAnalysis/spotbugs-main.html")
             stylesheet = 'fancy-hist.xsl'
         }
@@ -124,37 +124,37 @@ spotbugsTest {
     onlyIf {project.hasProperty('staticAnalysisMarker')}
     reports(({
         html {
-            enabled = true
+            required = true
             destination = file("$buildDir/reports/staticAnalysis/spotbugs-test.html")
             stylesheet = 'fancy-hist.xsl'
         }
     } as Closure<NamedDomainObjectContainer<? extends SpotBugsReport>>))
 }
 
 checkstyle {
-    toolVersion '8.34'
+    toolVersion '8.44'
     configFile file("config/checkstyle/checkstyle.xml")
 }
 checkstyleMain {
     onlyIf {project.hasProperty('staticAnalysisMarker')}
     source ='src/main/java'
     reports(({
         html {
-            enabled = true
+            required = true
             destination = file("$buildDir/reports/staticAnalysis/checkstyle-main.html")
         }
-        xml.enabled false
+        xml.required = false
     }))
 }
 checkstyleTest {
     onlyIf {project.hasProperty('staticAnalysisMarker')}
     source ='src/test/java'
     reports(({
         html {
-            enabled = true
+            required = true
             destination = file("$buildDir/reports/staticAnalysis/checkstyle-test.html")
         }
-        xml.enabled false
+        xml.required = false
     }))
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Jul 09 16:33:24 EEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -56,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; 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
 
@@ -159,14 +177,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
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/src/main/java/com/crowdin/cli/commands/functionality/FsFiles.java b/src/main/java/com/crowdin/cli/commands/functionality/FsFiles.java
@@ -1,7 +1,7 @@
 package com.crowdin.cli.commands.functionality;
 
 import com.crowdin.cli.utils.file.FileUtils;
-import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.ZipFile;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,7 +38,7 @@ public List<File> extractZipArchive(File zipArchive, File dir) {
         ZipFile zipFile;
         try {
             zipFile = new ZipFile(zipArchive);
-        } catch (net.lingala.zip4j.exception.ZipException e) {
+        } catch (IllegalArgumentException e) {
             throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.archive_not_exist"), zipArchive.getAbsolutePath()));
         }
         if (!dir.exists()) {