Skip to content

Commit

Permalink
Merge pull request #681 from sourcegraph/olafurpg/bump-kotlin
Browse files Browse the repository at this point in the history
Bump to latest scip-kotlin with Kotlin 1.9 support
  • Loading branch information
olafurpg committed Feb 2, 2024
2 parents bd493f7 + 19b8297 commit c9fd4ac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ project.git = true
align.preset = none
align.stripMargin = true
newlines.source=unfold
project.excludeFilters = [
"tests/snapshots/src/main/generated"
]
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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 :=
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit c9fd4ac

Please sign in to comment.