Goooler · Goooler · Jul 15, 2022 · Jul 15, 2022 · Jul 15, 2022 · Jul 15, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -132,6 +132,9 @@ The callback function provided as parameter to the format function is now called
 
 * Print an error message and return with non-zero exit code when no files are found that match with the globs ([#629](https://github.com/pinterest/ktlint/issue/629)).
 * Invoke callback on `format` function for all errors including errors that are autocorrected ([#1491](https://github.com/pinterest/ktlint/issues/1491))
+* Update Gradle to `7.5` version
+* Update Kotlin development version to `1.7.10` and Kotlin version to `1.7.10`.
+* Update Dokka to `1.7.10` version
 
 ### Removed
 

diff --git a/build.gradle b/build.gradle
@@ -111,7 +111,6 @@ tasks.register("publishNewRelease", DefaultTask.class) {
 }
 
 tasks.withType(Wrapper).configureEach {
-  gradleVersion = libs.versions.gradle
-  distributionSha256Sum = libs.versions.gradleSha256
-  distributionType = Wrapper.DistributionType.BIN
+  gradleVersion = libs.versions.gradle.get()
+  distributionSha256Sum = libs.versions.gradleSha256.get()
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,12 +9,12 @@ repositories {
 // Pass '-PkotlinDev' to command line to enable kotlin-in-development version
 val kotlinVersion = if (project.hasProperty("kotlinDev")) {
     logger.warn("Enabling kotlin dev version!")
-    "1.7.0"
+    "1.7.10"
 } else {
-    "1.7.0"
+    "1.7.10"
 }
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
 }
diff --git a/buildSrc/src/main/kotlin/ktlint-kotlin-common.gradle.kts b/buildSrc/src/main/kotlin/ktlint-kotlin-common.gradle.kts
@@ -9,10 +9,6 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
-
     // Do not enable explicit api for cli project
     if (project.name != "ktlint") {
         explicitApiWarning()

diff --git a/gradle.properties b/gradle.properties
@@ -22,3 +22,6 @@ org.gradle.vfs.watch=true
 
 # Uncomment following line to temporary bypass dependencies verification
 #org.gradle.dependency.verification=lenient
+
+# https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/
+kotlin.incremental.useClasspathSnapshot=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-gradle = "7.4"
-gradleSha256 = "8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634"
-kotlin = "1.7.0"
+gradle = "7.5"
+gradleSha256 = "cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2"
+kotlin = "1.7.10"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-githubRelease = "com.github.breadmoirai.github-release:2.2.12"
+githubRelease = "com.github.breadmoirai.github-release:2.4.1"
 checksum = "org.gradle.crypto.checksum:1.4.0"
 shadow = "com.github.johnrengelman.shadow:7.1.2"
 
@@ -14,13 +14,13 @@ kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable",
 klob = "com.github.shyiko.klob:klob:0.2.1"
 ec4j = "org.ec4j.core:ec4j-core:0.3.0"
 picocli = "info.picocli:picocli:4.6.3"
-logging = "io.github.microutils:kotlin-logging-jvm:2.1.21"
+logging = "io.github.microutils:kotlin-logging-jvm:2.1.23"
 # Use logback-classic as the logger for kotlin-logging / slf4j as it allow changing the log level at runtime.
 logback = "ch.qos.logback:logback-classic:1.2.11"
 # Required for logback.xml conditional configuration
 janino = "org.codehaus.janino:janino:3.1.7"
 # Testing libraries
-junit5 = "org.junit.jupiter:junit-jupiter:5.8.2"
-assertj = "org.assertj:assertj-core:3.22.0"
+junit5 = "org.junit.jupiter:junit-jupiter:5.9.0"
+assertj = "org.assertj:assertj-core:3.23.1"
 sarif4k = "io.github.detekt.sarif4k:sarif4k:0.0.1"
 jimfs = "com.google.jimfs:jimfs:1.2"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -44,7 +44,10 @@
             <trusting group="ch.qos.logback"/>
             <trusting group="org.slf4j"/>
          </trusted-key>
-         <trusted-key id="47eb6836245d2d40e89dfb4136d4e9618f3adab5" group="io.github.microutils" name="kotlin-logging-jvm" version="2.1.21"/>
+         <trusted-key id="47eb6836245d2d40e89dfb4136d4e9618f3adab5">
+            <trusting group="io.github.microutils" name="kotlin-logging-jvm" version="2.1.21"/>
+            <trusting group="io.github.microutils" name="kotlin-logging-jvm" version="2.1.23"/>
+         </trusted-key>
          <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
          <trusted-key id="4f5277bf72a045dad4ae36dd9440c8d6decafa12" group="org.testng" name="testng" version="6.13.1"/>
          <trusted-key id="53c935821aa6a755bd337db53595395eb3d8e1ba" group="org.apache.logging.log4j"/>
@@ -98,6 +101,7 @@
          <trusted-key id="9e84765a7aa3e3d3d5598a408e3f0de7ae354651" group="^com[.]squareup($|([.].*))" regex="true"/>
          <trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
          <trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
+         <trusted-key id="a7892505cf1a58076453e52d7999befba1039e8b" group="net.bytebuddy"/>
          <trusted-key id="aa417737bd805456db3cbdde6601e5c08dccbb96" group="info.picocli" name="picocli" version="4.6.3"/>
          <trusted-key id="aa70c7c433d501636392ec02153e7a3c2b4e5118">
             <trusting group="org.eclipse.ee4j"/>
@@ -179,11 +183,24 @@
             <sha256 value="0cce474144f67d4ad0a25cbc2e5e5adcd78645ecb2d6685325b231e4e38530b8" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="com.github.breadmoirai" name="github-release" version="2.4.1">
+         <artifact name="github-release-2.4.1.jar">
+            <sha256 value="043dc9ee40ff6cf502f92fdb96f24347bf396c87a48b169aadb0646c45bd754e" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="github-release-2.4.1.module">
+            <sha256 value="9848b62a27821d1526a0771c34ebd5070ea3e3fff085c83089514039d1b25687" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="com.github.breadmoirai.github-release" name="com.github.breadmoirai.github-release.gradle.plugin" version="2.2.12">
          <artifact name="com.github.breadmoirai.github-release.gradle.plugin-2.2.12.pom">
             <sha256 value="4f5fb4a87bbcbc1967a7bdf0b76180e95f2565716a208adf92cf01fb6f758a80" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="com.github.breadmoirai.github-release" name="com.github.breadmoirai.github-release.gradle.plugin" version="2.4.1">
+         <artifact name="com.github.breadmoirai.github-release.gradle.plugin-2.4.1.pom">
+            <sha256 value="4d76f309318dc21514634daa54c5ec16098129f002a2f6f4a943621d84e449c0" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="7.1.1">
          <artifact name="com.github.johnrengelman.shadow.gradle.plugin-7.1.1.pom">
             <sha256 value="43c86e6467b2f8f15351e7a44b4b235b6f18b2df6b49a9c05ebdcabac130ccc0" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -194,6 +211,14 @@
             <sha256 value="956e45085e52ea5ef32d34671ebb84eb1c41a83c4549af26e68635f1061798d3" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.10.2">
+         <artifact name="gradle-enterprise-gradle-plugin-3.10.2.jar">
+            <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
+         </artifact>
+         <artifact name="gradle-enterprise-gradle-plugin-3.10.2.pom">
+            <sha256 value="57603c9a75a9ef86ce30b1cb2db728d3cd9caf1be967343f1fc2316c85df5653" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.8.1">
          <artifact name="gradle-enterprise-gradle-plugin-3.8.1.jar">
             <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
@@ -202,6 +227,11 @@
             <sha256 value="e47a53196079934edf14b36b4b77e380d17327a3d8eeab05ba061ca3fc1334a5" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="com.gradle.enterprise" name="com.gradle.enterprise.gradle.plugin" version="3.10.2">
+         <artifact name="com.gradle.enterprise.gradle.plugin-3.10.2.pom">
+            <sha256 value="1ba8bac013e739c94e42ffe2c0fd4bf018a448013293b3062eacbe66f93ddfd8" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="com.gradle.enterprise" name="com.gradle.enterprise.gradle.plugin" version="3.8.1">
          <artifact name="com.gradle.enterprise.gradle.plugin-3.8.1.pom">
             <sha256 value="9fc8ccc9212ea0903c17dbea3c3dfb406d6db5490b6e65aa13a7af1fecda82b4" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -239,6 +269,11 @@
             <sha256 value="f49225833ab24596230bdab1f8e432389155371f61ecc04b89151b2ff0327419" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="io.github.microutils" name="kotlin-logging-jvm" version="2.1.23">
+         <artifact name="kotlin-logging-jvm-2.1.23.module">
+            <pgp value="47eb6836245d2d40e89dfb4136d4e9618f3adab5"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-parent" version="52">
          <artifact name="commons-parent-52.pom">
             <pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>
@@ -281,6 +316,14 @@
             <sha256 value="2bbed4a6eae63ce1998882009581eb7bfc3ed4e4e9e1ac52e9f3c309f672491e" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="2.3.3">
+         <artifact name="gradle-kotlin-dsl-plugins-2.3.3.jar">
+            <sha256 value="ba63ebb9e874a798510b5888a159622ef4e4d59f82e54d755ddcf5e60bf1257f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="gradle-kotlin-dsl-plugins-2.3.3.module">
+            <sha256 value="7b6bac1405119485fc9d694771024be4a509e874efcf38b22f947b85f99c8a9c" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="2.1.6">
          <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-2.1.6.pom">
             <sha256 value="572125e4c117e91c135ba6a60ba26124aabb67c62ea3a709045ad621d6ddf9c7" origin="Generated by Gradle"/>
@@ -291,6 +334,11 @@
             <sha256 value="61eaad5e5449288e912bdb16fa7c83f6718565c034cb7bf0916641a14f627a06" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="2.3.3">
+         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-2.3.3.pom">
+            <sha256 value="5cd2b71ed043af0e1969d2292bfdaa251fb858dc78f7a32ef0249f246c53c905" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains" name="markdown" version="0.2.4">
          <artifact name="markdown-metadata-0.2.4.jar">
             <sha256 value="23955bb4bbc929f7a98d79eb63ae91ae430abf80123315310f7eb433cf7b90d4" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -311,6 +359,11 @@
             <sha256 value="81a0f18b671b4e5b5141ce62965997cc8f824524c3c736120bd1257625922ee9" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-bom" version="4.5.1">
+         <artifact name="mockito-bom-4.5.1.pom">
+            <pgp value="147b691a19097624902f4ea9689cbe64f4bc997f"/>
+         </artifact>
+      </component>
       <component group="org.ow2" name="ow2" version="1.5">
          <artifact name="ow2-1.5.pom">
             <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle because artifact wasn't signed"/>

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,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -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 execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal