Upgrade all plugins/dependencies and Gradle

Author: rock3r

build.gradle

@@ -17,8 +17,8 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '2.1.0'
-    id 'com.ncorti.ktfmt.gradle' version '0.21.0'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.21'
+    id 'com.ncorti.ktfmt.gradle' version '0.22.0'
 }
 
 group 'kdocformatter'

gradle-plugin/build.gradle

@@ -17,11 +17,11 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '2.0.20'
+    id 'org.jetbrains.kotlin.jvm' version '2.1.21'
     id 'java-gradle-plugin'
     id 'maven-publish'
-    id 'com.gradle.plugin-publish' version '0.9.10'
-    id 'com.ncorti.ktfmt.gradle' version '0.20.1'
+    id 'com.gradle.plugin-publish' version '1.3.1'
+    id 'com.ncorti.ktfmt.gradle' version '0.22.0'
 }
 
 // https://issues.sonatype.org/browse/OSSRH-63191
@@ -58,25 +58,16 @@ kotlin {
 }
 
 gradlePlugin {
-    plugins {
-        kdocformatter {
-            id = "kdoc-formatter"
-            displayName = 'KDoc Formatting'
-            implementationClass = "kdocformatter.gradle.KDocFormatterPlugin"
-        }
-    }
-}
-
-pluginBundle {
     website = 'https://github.com/tnorbye/kdoc-formatter'
     vcsUrl = 'https://github.com/tnorbye/kdoc-formatter.git'
-    tags = ['kotlin', 'kdoc', 'formatter', 'formatting']
 
     plugins {
         kdocformatter {
             id = "kdoc-formatter"
             displayName = 'KDoc Formatting'
             description = 'Plugin which can reformat Kotlin KDoc comments'
+            implementationClass = "kdocformatter.gradle.KDocFormatterPlugin"
+            tags.set(['kotlin', 'kdoc', 'formatter', 'formatting'])
         }
     }
 }

gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -2,6 +2,9 @@
 
 # KDoc Formatter Plugin Changelog
 
+## [1.6.8]
+- Add support for IJP 2025.2 EAP
+
 ## [1.6.7]
 - Updated code to replace deprecated API usages
 - Fix issue #104: Include type parameters in parameter list reordering

ide-plugin/CHANGELOG.md

@@ -9,7 +9,7 @@ private fun properties(key: String) = project.findProperty(key).toString()
 plugins {
   id("java")
   id("org.jetbrains.kotlin.jvm")
-  id("org.jetbrains.intellij.platform") version "2.2.1"
+  id("org.jetbrains.intellij.platform") version "2.6.0"
   id("org.jetbrains.changelog") version "2.2.1"
   id("com.android.lint")
   id("com.ncorti.ktfmt.gradle")
@@ -26,8 +26,8 @@ version = pluginVersion
 
 repositories {
   google()
-  intellijPlatform { defaultRepositories() }
   mavenCentral()
+  intellijPlatform { defaultRepositories() }
 }
 
 intellijPlatform { pluginConfiguration { name = properties("pluginName") } }