From 19b82973ba0b55e39a24018d1e99a2d217956068 Mon Sep 17 00:00:00 2001 From: Olafur Geirsson Date: Fri, 2 Feb 2024 12:53:13 +0100 Subject: [PATCH] Bump to lastest scip-kotlin with Kotlin 1.9 support --- .scalafmt.conf | 3 +++ build.sbt | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 405fdf30f..31d4d7a7d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -6,3 +6,6 @@ project.git = true align.preset = none align.stripMargin = true newlines.source=unfold +project.excludeFilters = [ + "tests/snapshots/src/main/generated" +] diff --git a/build.sbt b/build.sbt index d7b0ccd9f..1f5a68606 100644 --- a/build.sbt +++ b/build.sbt @@ -23,12 +23,12 @@ lazy val V = val scala3 = "3.2.2" val metals = "0.11.11" val scalameta = "4.8.1" - val semanticdbKotlinc = "0.3.2" + val semanticdbKotlinc = "0.4.0" val testcontainers = "0.39.3" val requests = "0.6.5" val minimalMillVersion = "0.10.0" val millScipVersion = "0.3.6" - val kotlinGradlePlugin = "1.5.31" + val kotlinVersion = "1.9.22" } inThisBuild( @@ -122,7 +122,7 @@ lazy val gradlePlugin = project List( "dev.gradleplugins" % "gradle-api" % V.gradle % Provided, "dev.gradleplugins" % "gradle-test-kit" % V.gradle % Provided, - "org.jetbrains.kotlin" % "kotlin-gradle-plugin" % V.kotlinGradlePlugin % + "org.jetbrains.kotlin" % "kotlin-gradle-plugin" % V.kotlinVersion % Provided ), buildInfoKeys := @@ -257,7 +257,7 @@ lazy val cli = project "com.lihaoyi" %% "requests" % V.requests, "org.scalameta" %% "moped" % V.moped, "org.scalameta" %% "ascii-graphs" % "0.1.2", - "org.jetbrains.kotlin" % "kotlin-compiler-embeddable" % "1.8.21" + "org.jetbrains.kotlin" % "kotlin-compiler-embeddable" % V.kotlinVersion ), (Compile / resourceGenerators) += Def