From 81757172b6973db34e9778261a298a061f6b781b Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Sun, 12 Apr 2026 08:51:22 +0200 Subject: [PATCH] 1.7.0: Support IntelliJ 2026.1 --- CHANGELOG.md | 3 +++ README.md | 2 +- build.gradle.kts | 1 + gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- ide-plugin/CHANGELOG.md | 3 +++ ide-plugin/build.gradle.kts | 1 + ide-plugin/gradle.properties | 10 +++++----- library/src/main/resources/version.properties | 2 +- settings.gradle.kts | 1 + 13 files changed, 22 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f75002..8e00caf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ # KDoc Formatter Changelog +## [1.7.0] +- IDE-only update: Marked compatible with IntelliJ IDEA 2026.1. + ## [1.6.9] - IDE-only update: Marked compatible with IntelliJ IDEA 2025.3. diff --git a/README.md b/README.md index 8de3ef7..9005a4c 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ Options: @ Read filenames from file. -kdoc-formatter: Version 1.6.9 +kdoc-formatter: Version 1.7.0 https://github.com/tnorbye/kdoc-formatter ``` diff --git a/build.gradle.kts b/build.gradle.kts index b090bb0..c3c8879 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ repositories { google() mavenCentral() gradlePluginPortal() + maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") } } tasks.register("lint") { dependsOn(":library:lint", ":cli:lint", ":ide-plugin:lint") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1aab5f..01361c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.2.21" +kotlin = "2.4.0-Beta1" android-gradle-plugin = "8.13.2" ktfmt = "0.25.0" intellij-platform = "2.10.5" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..aaaabb3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -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. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' 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. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 diff --git a/ide-plugin/CHANGELOG.md b/ide-plugin/CHANGELOG.md index 8e59675..087bbbc 100644 --- a/ide-plugin/CHANGELOG.md +++ b/ide-plugin/CHANGELOG.md @@ -2,6 +2,9 @@ # KDoc Formatter Plugin Changelog +## [1.7.0] +- Add support for 2026.1 and 2026.2 EAP + ## [1.6.9] - Add support for 2025.3 EAP diff --git a/ide-plugin/build.gradle.kts b/ide-plugin/build.gradle.kts index e0eaaee..5497438 100644 --- a/ide-plugin/build.gradle.kts +++ b/ide-plugin/build.gradle.kts @@ -28,6 +28,7 @@ repositories { google() mavenCentral() intellijPlatform { defaultRepositories() } + maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") } } intellijPlatform { pluginConfiguration { name = properties("pluginName") } } diff --git a/ide-plugin/gradle.properties b/ide-plugin/gradle.properties index 630ee72..0695165 100644 --- a/ide-plugin/gradle.properties +++ b/ide-plugin/gradle.properties @@ -7,19 +7,19 @@ pluginRepositoryUrl = https://github.com/tnorbye/kdoc-formatter # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 243 -pluginUntilBuild = 253.* +pluginSinceBuild = 261 +pluginUntilBuild = 271.* # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties -platformType = IC -platformVersion = 2025.2 +platformType = IU +platformVersion = 2026.1 #platformVersion = 253.28294.334 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html platformPlugins = org.jetbrains.kotlin,com.intellij.java,org.intellij.intelliLang # Java language level used to compile sources and to generate the files for -javaVersion = 17 +javaVersion = 21 # Opt-out flag for bundling Kotlin standard library. kotlin.stdlib.default.dependency=false diff --git a/library/src/main/resources/version.properties b/library/src/main/resources/version.properties index 7e01115..9e75510 100644 --- a/library/src/main/resources/version.properties +++ b/library/src/main/resources/version.properties @@ -15,4 +15,4 @@ # # Release version definition -buildVersion = 1.6.9 +buildVersion = 1.7.0 diff --git a/settings.gradle.kts b/settings.gradle.kts index 0233cc3..f22a266 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ pluginManagement { google() mavenCentral() gradlePluginPortal() + maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") } } }