Merge pull request #51 from nhajratw/upgrade-gradle

Upgrade gradle & dependencies

Author: bnasslahsen

build.gradle.kts

@@ -1,9 +1,10 @@
 plugins {
 	`java-gradle-plugin`
-	id("com.gradle.plugin-publish") version "0.11.0"
-	id("org.sonarqube") version "2.8"
+	id("com.gradle.plugin-publish") version "0.14.0"
+	id("org.sonarqube") version "3.1.1"
 	kotlin("jvm") version "1.4.31"
 	`maven-publish`
+	id("com.github.ben-manes.versions") version "0.38.0"
 }
 
 group = "org.springdoc"
@@ -40,15 +41,15 @@ publishing {
 
 dependencies {
 	implementation(kotlin("reflect"))
-	implementation(group = "khttp", name = "khttp", version = "1.0.0")
-	implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
-	implementation(group = "org.awaitility", name = "awaitility-kotlin", version = "4.0.2")
+	implementation("khttp:khttp:1.0.0")
+	implementation("com.google.code.gson:gson:2.8.6")
+	implementation("org.awaitility:awaitility-kotlin:4.0.3")
 	implementation(files("$projectDir/libs/gradle-processes-0.5.0.jar"))
 
 	testImplementation(gradleTestKit())
 	testImplementation(platform("org.junit:junit-bom:5.7.1"))
 	testImplementation("org.junit.jupiter:junit-jupiter")
-	testImplementation("com.beust:klaxon:5.2")
+	testImplementation("com.beust:klaxon:5.5")
 }
 
 gradlePlugin {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,7 +130,7 @@ fi
 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

gradlew

@@ -40,7 +40,7 @@ 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.
@@ -54,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%
@@ -64,29 +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