From c7b2c11489cc7a4dbc532a51e269ebe159940b82 Mon Sep 17 00:00:00 2001 From: danischroeter Date: Thu, 1 Feb 2024 13:30:08 +0100 Subject: [PATCH 1/3] Bump sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e8a1e24..abbbce5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.8 From c0475ac7710bd708cb847c4680a4f71ac8e52ead Mon Sep 17 00:00:00 2001 From: danischroeter Date: Thu, 1 Feb 2024 13:31:14 +0100 Subject: [PATCH 2/3] Replace sbt-osgi from lightbend with sbt plugin and upgrade --- project/plugins.sbt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index aaedc9a..4868342 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,4 @@ -//see pekko https://github.com/apache/incubator-pekko/blob/bd1af56fcead435cb3d730e759223dcb2b0fb4c6/project/plugins.sbt#L18 -// sbt-osgi 0.9.5 is available but breaks including jdk9-only classes -// sbt-osgi 0.9.6 is available but breaks populating pekko-protobuf-v3 -addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4") +addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.11") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") From 24fde256e470b7370af861eb96879b7296e562c8 Mon Sep 17 00:00:00 2001 From: danischroeter Date: Thu, 1 Feb 2024 13:33:59 +0100 Subject: [PATCH 3/3] Updates all plugins to the latest stable versions --- project/plugins.sbt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4868342..d34a956 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,5 @@ -addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.11") - +addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.10.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0") -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")