diff --git a/core/pom.xml b/core/pom.xml index 8ef784c6..1511db23 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,7 +16,7 @@ 0.10.1 - 1.6.20-M1 + 1.8.22 true 1.8 com.facebook.ktfmt.cli.Main diff --git a/online_formatter/build.gradle.kts b/online_formatter/build.gradle.kts index 140c3384..60d07a40 100644 --- a/online_formatter/build.gradle.kts +++ b/online_formatter/build.gradle.kts @@ -14,9 +14,7 @@ * limitations under the License. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { kotlin("jvm") version "1.5.0" } +plugins { kotlin("jvm") version "1.8.22" } repositories { mavenLocal() @@ -35,11 +33,11 @@ dependencies { testImplementation(kotlin("test-junit")) } +kotlin { jvmToolchain(11) } + tasks { test { useJUnit() } - withType() { kotlinOptions.jvmTarget = "11" } - val packageFat by creating(Zip::class) { from(compileKotlin) diff --git a/online_formatter/gradle/wrapper/gradle-wrapper.properties b/online_formatter/gradle/wrapper/gradle-wrapper.properties index be52383e..db9a6b82 100644 --- a/online_formatter/gradle/wrapper/gradle-wrapper.properties +++ b/online_formatter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists