From f73b8593c3d7a2b5f1e053ecd5110ee696b05408 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 15 Mar 2024 20:25:40 +0100 Subject: [PATCH] update sbt plugin for paradox (#100) * update * upgrade scala * upgrade sbt --- docs-gen/build.sbt | 2 -- docs-gen/project/build.properties | 2 +- docs-gen/project/plugins.sbt | 4 +--- pekko-sample-cluster-client-grpc-scala/build.sbt | 2 +- .../project/build.properties | 2 +- pekko-sample-cluster-docker-compose-java/build.sbt | 2 +- .../project/build.properties | 2 +- pekko-sample-cluster-docker-compose-scala/build.sbt | 2 +- .../project/build.properties | 2 +- pekko-sample-cluster-java/build.sbt | 2 +- pekko-sample-cluster-java/project/build.properties | 2 +- pekko-sample-cluster-kubernetes-scala/build.sbt | 2 +- .../project/build.properties | 2 +- pekko-sample-cluster-scala/build.sbt | 2 +- pekko-sample-cluster-scala/project/build.properties | 2 +- pekko-sample-distributed-data-java/build.sbt | 2 +- pekko-sample-distributed-data-java/project/build.properties | 2 +- pekko-sample-distributed-data-scala/build.sbt | 2 +- pekko-sample-distributed-data-scala/project/build.properties | 2 +- pekko-sample-distributed-workers-scala/build.sbt | 2 +- .../project/build.properties | 2 +- pekko-sample-fsm-scala/build.sbt | 2 +- pekko-sample-fsm-scala/project/build.properties | 2 +- pekko-sample-grpc-kubernetes-scala/build.sbt | 2 +- pekko-sample-grpc-kubernetes-scala/project/build.properties | 2 +- pekko-sample-kafka-to-sharding-scala/build.sbt | 2 +- pekko-sample-kafka-to-sharding-scala/project/build.properties | 2 +- pekko-sample-persistence-dc-scala/build.sbt | 2 +- pekko-sample-persistence-dc-scala/project/build.properties | 2 +- pekko-sample-persistence-scala/build.sbt | 2 +- pekko-sample-persistence-scala/project/build.properties | 2 +- pekko-sample-sharding-java/build.sbt | 2 +- pekko-sample-sharding-java/project/build.properties | 2 +- pekko-sample-sharding-scala/build.sbt | 2 +- pekko-sample-sharding-scala/project/build.properties | 2 +- 35 files changed, 34 insertions(+), 38 deletions(-) diff --git a/docs-gen/build.sbt b/docs-gen/build.sbt index f656932..c6c6e0c 100644 --- a/docs-gen/build.sbt +++ b/docs-gen/build.sbt @@ -1,5 +1,3 @@ -ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo - lazy val `pekko-sample-cluster-java` = project .enablePlugins(PekkoSamplePlugin) .settings( diff --git a/docs-gen/project/build.properties b/docs-gen/project/build.properties index e8a1e24..04267b1 100644 --- a/docs-gen/project/build.properties +++ b/docs-gen/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/docs-gen/project/plugins.sbt b/docs-gen/project/plugins.sbt index 6b9d58e..3266aba 100644 --- a/docs-gen/project/plugins.sbt +++ b/docs-gen/project/plugins.sbt @@ -1,3 +1 @@ -resolvers += Resolver.ApacheMavenSnapshotsRepo - -addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0+5-b3a6a5ce-SNAPSHOT") +addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1") diff --git a/pekko-sample-cluster-client-grpc-scala/build.sbt b/pekko-sample-cluster-client-grpc-scala/build.sbt index 2e2b4a8..d35ad1a 100644 --- a/pekko-sample-cluster-client-grpc-scala/build.sbt +++ b/pekko-sample-cluster-client-grpc-scala/build.sbt @@ -10,7 +10,7 @@ lazy val `pekko-sample-cluster-client-grpc-scala` = project .settings(multiJvmSettings: _*) .settings( organization := "org.apache.pekko", - scalaVersion := "2.13.11", + scalaVersion := "2.13.13", Compile / scalacOptions ++= Seq( "-deprecation", "-feature", diff --git a/pekko-sample-cluster-client-grpc-scala/project/build.properties b/pekko-sample-cluster-client-grpc-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-cluster-client-grpc-scala/project/build.properties +++ b/pekko-sample-cluster-client-grpc-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-cluster-docker-compose-java/build.sbt b/pekko-sample-cluster-docker-compose-java/build.sbt index 529971c..9cf986a 100644 --- a/pekko-sample-cluster-docker-compose-java/build.sbt +++ b/pekko-sample-cluster-docker-compose-java/build.sbt @@ -1,7 +1,7 @@ organization := "org.apache.pekko" /* scala versions and options */ -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" // These options will be used for *all* versions. scalacOptions ++= Seq( diff --git a/pekko-sample-cluster-docker-compose-java/project/build.properties b/pekko-sample-cluster-docker-compose-java/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-cluster-docker-compose-java/project/build.properties +++ b/pekko-sample-cluster-docker-compose-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-cluster-docker-compose-scala/build.sbt b/pekko-sample-cluster-docker-compose-scala/build.sbt index 6f6824d..2a976b7 100644 --- a/pekko-sample-cluster-docker-compose-scala/build.sbt +++ b/pekko-sample-cluster-docker-compose-scala/build.sbt @@ -2,7 +2,7 @@ organization := "org.apache.pekko" name := "pekko-sample-cluster-docker-compose-scala" /* scala versions and options */ -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" // These options will be used for *all* versions. scalacOptions ++= Seq( diff --git a/pekko-sample-cluster-docker-compose-scala/project/build.properties b/pekko-sample-cluster-docker-compose-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-cluster-docker-compose-scala/project/build.properties +++ b/pekko-sample-cluster-docker-compose-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-cluster-java/build.sbt b/pekko-sample-cluster-java/build.sbt index 81ac804..0a3239f 100644 --- a/pekko-sample-cluster-java/build.sbt +++ b/pekko-sample-cluster-java/build.sbt @@ -9,7 +9,7 @@ lazy val `pekko-sample-cluster-java` = project .settings(multiJvmSettings: _*) .settings( organization := "org.apache.pekko", - scalaVersion := "2.13.11", + scalaVersion := "2.13.13", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-parameters", "-Xlint:unchecked", "-Xlint:deprecation"), run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m", "-Djava.library.path=./target/native"), diff --git a/pekko-sample-cluster-java/project/build.properties b/pekko-sample-cluster-java/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-cluster-java/project/build.properties +++ b/pekko-sample-cluster-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-cluster-kubernetes-scala/build.sbt b/pekko-sample-cluster-kubernetes-scala/build.sbt index e0b889f..761c6d3 100644 --- a/pekko-sample-cluster-kubernetes-scala/build.sbt +++ b/pekko-sample-cluster-kubernetes-scala/build.sbt @@ -2,7 +2,7 @@ ThisBuild / organization := "org.apache.pekko" name := "pekko-sample-cluster-kubernetes-scala" -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" val pekkoHttpVersion = "1.0.1" val pekkoVersion = "1.0.2" val pekkoManagementVersion = "1.0.0" diff --git a/pekko-sample-cluster-kubernetes-scala/project/build.properties b/pekko-sample-cluster-kubernetes-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-cluster-kubernetes-scala/project/build.properties +++ b/pekko-sample-cluster-kubernetes-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-cluster-scala/build.sbt b/pekko-sample-cluster-scala/build.sbt index a2c5c32..e6b86df 100644 --- a/pekko-sample-cluster-scala/build.sbt +++ b/pekko-sample-cluster-scala/build.sbt @@ -9,7 +9,7 @@ lazy val `pekko-sample-cluster-scala` = project .settings(multiJvmSettings: _*) .settings( organization := "org.apache.pekko", - scalaVersion := "2.13.11", + scalaVersion := "2.13.13", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m", "-Djava.library.path=./target/native"), diff --git a/pekko-sample-cluster-scala/project/build.properties b/pekko-sample-cluster-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-cluster-scala/project/build.properties +++ b/pekko-sample-cluster-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-distributed-data-java/build.sbt b/pekko-sample-distributed-data-java/build.sbt index 3a7c7b6..33aab01 100644 --- a/pekko-sample-distributed-data-java/build.sbt +++ b/pekko-sample-distributed-data-java/build.sbt @@ -10,7 +10,7 @@ val `pekko-sample-distributed-data-java` = project .settings( organization := "org.apache.pekko", version := "1.0", - scalaVersion := "2.13.11", + scalaVersion := "2.13.13", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-parameters", "-Xlint:unchecked", "-Xlint:deprecation", "-Xdiags:verbose"), run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m"), diff --git a/pekko-sample-distributed-data-java/project/build.properties b/pekko-sample-distributed-data-java/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-distributed-data-java/project/build.properties +++ b/pekko-sample-distributed-data-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-distributed-data-scala/build.sbt b/pekko-sample-distributed-data-scala/build.sbt index 067f75d..52c92aa 100644 --- a/pekko-sample-distributed-data-scala/build.sbt +++ b/pekko-sample-distributed-data-scala/build.sbt @@ -10,7 +10,7 @@ val `pekko-sample-distributed-data-scala` = project .settings( organization := "org.apache.pekko", version := "1.0", - scalaVersion := "2.13.11", + scalaVersion := "2.13.13", Compile / scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), Compile / javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"), run / javaOptions ++= Seq("-Xms128m", "-Xmx1024m"), diff --git a/pekko-sample-distributed-data-scala/project/build.properties b/pekko-sample-distributed-data-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-distributed-data-scala/project/build.properties +++ b/pekko-sample-distributed-data-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-distributed-workers-scala/build.sbt b/pekko-sample-distributed-workers-scala/build.sbt index 4d86189..180884f 100644 --- a/pekko-sample-distributed-workers-scala/build.sbt +++ b/pekko-sample-distributed-workers-scala/build.sbt @@ -2,7 +2,7 @@ name := "pekko-distributed-workers-scala" version := "1.0" -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" val pekkoVersion = "1.0.2" val cassandraPluginVersion = "1.0.0" val logbackVersion = "1.2.13" diff --git a/pekko-sample-distributed-workers-scala/project/build.properties b/pekko-sample-distributed-workers-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-distributed-workers-scala/project/build.properties +++ b/pekko-sample-distributed-workers-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-fsm-scala/build.sbt b/pekko-sample-fsm-scala/build.sbt index b071486..94c35e2 100644 --- a/pekko-sample-fsm-scala/build.sbt +++ b/pekko-sample-fsm-scala/build.sbt @@ -4,7 +4,7 @@ name := "pekko-sample-fsm-scala" val pekkoVersion = "1.0.2" val logbackVersion = "1.2.13" -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-actor-typed" % pekkoVersion, "ch.qos.logback" % "logback-classic" % logbackVersion) diff --git a/pekko-sample-fsm-scala/project/build.properties b/pekko-sample-fsm-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-fsm-scala/project/build.properties +++ b/pekko-sample-fsm-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-grpc-kubernetes-scala/build.sbt b/pekko-sample-grpc-kubernetes-scala/build.sbt index 82070ad..1cc197e 100644 --- a/pekko-sample-grpc-kubernetes-scala/build.sbt +++ b/pekko-sample-grpc-kubernetes-scala/build.sbt @@ -1,5 +1,5 @@ name := "pekko-grpc-kubernetes" -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" lazy val pekkoVersion = "1.0.2" lazy val discoveryVersion = "1.0.0" diff --git a/pekko-sample-grpc-kubernetes-scala/project/build.properties b/pekko-sample-grpc-kubernetes-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-grpc-kubernetes-scala/project/build.properties +++ b/pekko-sample-grpc-kubernetes-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-kafka-to-sharding-scala/build.sbt b/pekko-sample-kafka-to-sharding-scala/build.sbt index 38ecece..a270398 100644 --- a/pekko-sample-kafka-to-sharding-scala/build.sbt +++ b/pekko-sample-kafka-to-sharding-scala/build.sbt @@ -7,7 +7,7 @@ val EmbeddedKafkaVersion = "2.4.1.1" val logbackVersion = "1.2.13" val slf4jVersion = "1.7.32" -ThisBuild / scalaVersion := "2.13.11" +ThisBuild / scalaVersion := "2.13.13" ThisBuild / organization := "org.apache.pekko" ThisBuild / Compile / scalacOptions ++= Seq( "-deprecation", diff --git a/pekko-sample-kafka-to-sharding-scala/project/build.properties b/pekko-sample-kafka-to-sharding-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-kafka-to-sharding-scala/project/build.properties +++ b/pekko-sample-kafka-to-sharding-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-persistence-dc-scala/build.sbt b/pekko-sample-persistence-dc-scala/build.sbt index 86a9acb..b81f322 100644 --- a/pekko-sample-persistence-dc-scala/build.sbt +++ b/pekko-sample-persistence-dc-scala/build.sbt @@ -1,7 +1,7 @@ organization := "org.apache.pekko" name := "pekko-sample-replicated-event-sourcing-scala" -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" val pekkoVersion = "1.0.2" val cassandraPluginVersion = "1.0.0" diff --git a/pekko-sample-persistence-dc-scala/project/build.properties b/pekko-sample-persistence-dc-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-persistence-dc-scala/project/build.properties +++ b/pekko-sample-persistence-dc-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-persistence-scala/build.sbt b/pekko-sample-persistence-scala/build.sbt index 26fe509..d57badd 100644 --- a/pekko-sample-persistence-scala/build.sbt +++ b/pekko-sample-persistence-scala/build.sbt @@ -1,7 +1,7 @@ organization := "org.apache.pekko" name := "pekko-sample-persistence-scala" -scalaVersion := "2.13.11" +scalaVersion := "2.13.13" val pekkoVersion = "1.0.2" val logbackVersion = "1.2.13" diff --git a/pekko-sample-persistence-scala/project/build.properties b/pekko-sample-persistence-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-persistence-scala/project/build.properties +++ b/pekko-sample-persistence-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-sharding-java/build.sbt b/pekko-sample-sharding-java/build.sbt index 87e941a..2fde037 100644 --- a/pekko-sample-sharding-java/build.sbt +++ b/pekko-sample-sharding-java/build.sbt @@ -4,7 +4,7 @@ val logbackVersion = "1.2.13" lazy val buildSettings = Seq( organization := "org.apache.pekko", - scalaVersion := "2.13.11") + scalaVersion := "2.13.13") lazy val commonJavacOptions = Seq( "-Xlint:unchecked", diff --git a/pekko-sample-sharding-java/project/build.properties b/pekko-sample-sharding-java/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-sharding-java/project/build.properties +++ b/pekko-sample-sharding-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 diff --git a/pekko-sample-sharding-scala/build.sbt b/pekko-sample-sharding-scala/build.sbt index 14dfaf1..8c7920b 100644 --- a/pekko-sample-sharding-scala/build.sbt +++ b/pekko-sample-sharding-scala/build.sbt @@ -4,7 +4,7 @@ val logbackVersion = "1.2.13" lazy val buildSettings = Seq( organization := "org.apache.pekko", - scalaVersion := "2.13.11") + scalaVersion := "2.13.13") lazy val commonScalacOptions = Seq( "-deprecation", diff --git a/pekko-sample-sharding-scala/project/build.properties b/pekko-sample-sharding-scala/project/build.properties index e8a1e24..04267b1 100644 --- a/pekko-sample-sharding-scala/project/build.properties +++ b/pekko-sample-sharding-scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9