diff --git a/ktfmt_idea_plugin/build.gradle.kts b/ktfmt_idea_plugin/build.gradle.kts index 585fba8f..45683788 100644 --- a/ktfmt_idea_plugin/build.gradle.kts +++ b/ktfmt_idea_plugin/build.gradle.kts @@ -20,12 +20,13 @@ plugins { id("com.diffplug.spotless") version "5.10.2" } -val ktfmtVersion = rootProject.file("../version.txt").readText().trim().replace("-SNAPSHOT", "") +val currentKtfmtVersion = rootProject.file("../version.txt").readText().trim() +val stableKtfmtVersion = rootProject.file("../stable_version.txt").readText().trim() val pluginVersion = "1.1" group = "com.facebook" -version = "$pluginVersion.$ktfmtVersion" +version = "$pluginVersion.$currentKtfmtVersion" repositories { mavenCentral() @@ -38,8 +39,8 @@ java { } dependencies { - implementation("com.facebook", "ktfmt", ktfmtVersion) - implementation("com.google.googlejavaformat", "google-java-format", "1.8") + implementation("com.facebook", "ktfmt", stableKtfmtVersion) + implementation("com.google.googlejavaformat", "google-java-format", "1.22.0") } // See https://github.com/JetBrains/gradle-intellij-plugin/ @@ -59,4 +60,4 @@ tasks { runPluginVerifier { ideVersions.set(listOf("221")) } } -spotless { java { googleJavaFormat("1.21.0") } } +spotless { java { googleJavaFormat("1.22.0") } } diff --git a/ktfmt_idea_plugin/gradle/wrapper/gradle-wrapper.properties b/ktfmt_idea_plugin/gradle/wrapper/gradle-wrapper.properties index 9f4197d5..ac72c34e 100644 --- a/ktfmt_idea_plugin/gradle/wrapper/gradle-wrapper.properties +++ b/ktfmt_idea_plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/online_formatter/build.gradle.kts b/online_formatter/build.gradle.kts index 60d07a40..0d8f3f88 100644 --- a/online_formatter/build.gradle.kts +++ b/online_formatter/build.gradle.kts @@ -21,7 +21,7 @@ repositories { mavenCentral() } -val ktfmtVersion = rootProject.file("../version.txt").readText().trim() +val ktfmtVersion = rootProject.file("../stable_version.txt").readText().trim() dependencies { implementation("com.facebook:ktfmt:$ktfmtVersion") diff --git a/online_formatter/gradle/wrapper/gradle-wrapper.properties b/online_formatter/gradle/wrapper/gradle-wrapper.properties index db9a6b82..ac72c34e 100644 --- a/online_formatter/gradle/wrapper/gradle-wrapper.properties +++ b/online_formatter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/stable_version.txt b/stable_version.txt new file mode 100644 index 00000000..8ae5e618 --- /dev/null +++ b/stable_version.txt @@ -0,0 +1 @@ +0.48