From 59b135d1933d50ccb1570dd990e181a3c4474ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Thu, 29 Jun 2023 17:00:33 +0200 Subject: [PATCH 1/2] build: Bump sbt 1.9.1, include release notes url in pom --- .circleci/config.yml | 2 +- project/Common.scala | 4 ++++ project/build.properties | 2 +- samples/java-spring-fibonacci-action/project/build.properties | 2 +- .../project/build.properties | 2 +- samples/scala-protobuf-doc-snippets/project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- .../scala-protobuf-fibonacci-action/project/build.properties | 2 +- samples/scala-protobuf-first-service/project/build.properties | 2 +- .../scala-protobuf-reliable-timers/project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- .../project/build.properties | 2 +- samples/scala-protobuf-view-store/project/build.properties | 2 +- samples/scala-protobuf-web-resources/project/build.properties | 2 +- 20 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dbeb916271..3830546354 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ commands: parameters: version: type: string - default: "1.8.2" + default: "1.9.1" steps: - install-java - run: diff --git a/project/Common.scala b/project/Common.scala index 894f335e77..d87d2cd286 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -27,6 +27,10 @@ object CommonSettings extends AutoPlugin { url = url("https://lightbend.com"))), scmInfo := Some( ScmInfo(url("https://github.com/lightbend/kalix-jvm-sdk"), "scm:git@github.com:lightbend/kalix-jvm-sdk.git")), + releaseNotesURL := ( + if ((ThisBuild / isSnapshot).value) None + else Some(url(s"https://github.com/lightbend/kalix-jvm-sdk/releases/tag/v${version.value}")) + ), startYear := Some(2021), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), scalafmtOnCompile := !insideCI.value, diff --git a/project/build.properties b/project/build.properties index e2ed132169..6f94b56f49 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # update even the version in .circleci/config.yml `setup_sbt:` -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/java-spring-fibonacci-action/project/build.properties b/samples/java-spring-fibonacci-action/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/java-spring-fibonacci-action/project/build.properties +++ b/samples/java-spring-fibonacci-action/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-customer-registry-quickstart/project/build.properties b/samples/scala-protobuf-customer-registry-quickstart/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-customer-registry-quickstart/project/build.properties +++ b/samples/scala-protobuf-customer-registry-quickstart/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-doc-snippets/project/build.properties b/samples/scala-protobuf-doc-snippets/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-doc-snippets/project/build.properties +++ b/samples/scala-protobuf-doc-snippets/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-eventsourced-counter/project/build.properties b/samples/scala-protobuf-eventsourced-counter/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-eventsourced-counter/project/build.properties +++ b/samples/scala-protobuf-eventsourced-counter/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/project/build.properties b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry-subscriber/project/build.properties +++ b/samples/scala-protobuf-eventsourced-customer-registry-subscriber/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-eventsourced-customer-registry/project/build.properties b/samples/scala-protobuf-eventsourced-customer-registry/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-eventsourced-customer-registry/project/build.properties +++ b/samples/scala-protobuf-eventsourced-customer-registry/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-eventsourced-shopping-cart/project/build.properties b/samples/scala-protobuf-eventsourced-shopping-cart/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-eventsourced-shopping-cart/project/build.properties +++ b/samples/scala-protobuf-eventsourced-shopping-cart/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-fibonacci-action/project/build.properties b/samples/scala-protobuf-fibonacci-action/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-fibonacci-action/project/build.properties +++ b/samples/scala-protobuf-fibonacci-action/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-first-service/project/build.properties b/samples/scala-protobuf-first-service/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-first-service/project/build.properties +++ b/samples/scala-protobuf-first-service/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-reliable-timers/project/build.properties b/samples/scala-protobuf-reliable-timers/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-reliable-timers/project/build.properties +++ b/samples/scala-protobuf-reliable-timers/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-replicatedentity-examples/project/build.properties b/samples/scala-protobuf-replicatedentity-examples/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-replicatedentity-examples/project/build.properties +++ b/samples/scala-protobuf-replicatedentity-examples/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-replicatedentity-shopping-cart/project/build.properties b/samples/scala-protobuf-replicatedentity-shopping-cart/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-replicatedentity-shopping-cart/project/build.properties +++ b/samples/scala-protobuf-replicatedentity-shopping-cart/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-valueentity-counter/project/build.properties b/samples/scala-protobuf-valueentity-counter/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-valueentity-counter/project/build.properties +++ b/samples/scala-protobuf-valueentity-counter/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-valueentity-customer-registry/project/build.properties b/samples/scala-protobuf-valueentity-customer-registry/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-valueentity-customer-registry/project/build.properties +++ b/samples/scala-protobuf-valueentity-customer-registry/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-valueentity-shopping-cart/project/build.properties b/samples/scala-protobuf-valueentity-shopping-cart/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-valueentity-shopping-cart/project/build.properties +++ b/samples/scala-protobuf-valueentity-shopping-cart/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-view-store/project/build.properties b/samples/scala-protobuf-view-store/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-view-store/project/build.properties +++ b/samples/scala-protobuf-view-store/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 diff --git a/samples/scala-protobuf-web-resources/project/build.properties b/samples/scala-protobuf-web-resources/project/build.properties index 46e43a97ed..3c0b78a7c6 100644 --- a/samples/scala-protobuf-web-resources/project/build.properties +++ b/samples/scala-protobuf-web-resources/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.1 From 5961502ebd7610f28e41782c0b4325f141f16d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 30 Jun 2023 10:46:40 +0200 Subject: [PATCH 2/2] formatting --- project/Common.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Common.scala b/project/Common.scala index d87d2cd286..d6ca0f39eb 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -30,7 +30,7 @@ object CommonSettings extends AutoPlugin { releaseNotesURL := ( if ((ThisBuild / isSnapshot).value) None else Some(url(s"https://github.com/lightbend/kalix-jvm-sdk/releases/tag/v${version.value}")) - ), + ), startYear := Some(2021), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), scalafmtOnCompile := !insideCI.value,