bump: brute-force versions upgrade (#1154)

ennru · web-flow · commit 78fded91c23b · 2022-10-05T17:13:05.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,7 +36,7 @@ commands:
     parameters:
       version:
         type: string
-        default: "1.6.2"
+        default: "1.7.2"
     steps:
       - install-java-11
       - run:
diff --git a/build.sbt b/build.sbt
@@ -22,7 +22,7 @@ lazy val `kalix-jvm-sdk` = project
 def common: Seq[Setting[_]] =
   Seq(
     Compile / javacOptions ++= Seq("-encoding", "UTF-8", "--release", "11"),
-    Compile / scalacOptions ++= Seq("-encoding", "UTF-8", "-release", "11"))
+    Compile / scalacOptions ++= Seq("-encoding", "UTF-8", "-release", "11", "-deprecation"))
 
 lazy val sdkCore = project
   .in(file("sdk/core"))
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -16,21 +16,21 @@ object Dependencies {
 
   val ProtobufVersion = akka.grpc.gen.BuildInfo.googleProtobufVersion
 
-  val AkkaVersion = "2.6.19"
-  val AkkaHttpVersion = "10.2.9" // Note: should at least the Akka HTTP version required by Akka gRPC
-  val ScalaTestVersion = "3.2.12"
-  val JacksonVersion = "2.13.2"
-  val JacksonDatabindVersion = "2.13.2.2"
+  val AkkaVersion = "2.6.20"
+  val AkkaHttpVersion = "10.2.10" // Note: should at least the Akka HTTP version required by Akka gRPC
+  val ScalaTestVersion = "3.2.14"
+  val JacksonVersion = "2.13.4"
+  val JacksonDatabindVersion = "2.13.4"
   val DockerBaseImageVersion = "adoptopenjdk/openjdk11:debianslim-jre"
   val LogbackVersion = "1.2.11"
   val LogbackContribVersion = "0.1.5"
-  val TestContainersVersion = "1.17.1"
+  val TestContainersVersion = "1.17.5"
   val JUnitVersion = "4.13.2"
   val JUnitInterfaceVersion = "0.11"
   val JUnitJupiterVersion = "5.7.1"
-  val SpringVersion = "2.7.0"
+  val SpringVersion = "2.7.4"
 
-  val CommonsIoVersion = "2.8.0"
+  val CommonsIoVersion = "2.11.0"
   val MunitVersion = "0.7.29"
   val ScoptVersions = "4.0.0"
 
@@ -120,7 +120,7 @@ object Dependencies {
     "net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % IntegrationTest,
     "org.springframework.boot" % "spring-boot-starter-test" % SpringVersion % IntegrationTest,
     junit5 % IntegrationTest,
-    "org.awaitility" % "awaitility" % "4.1.0" % IntegrationTest)
+    "org.awaitility" % "awaitility" % "4.2.0" % IntegrationTest)
 
   val sdkSpringTestKit =
     deps ++= springDeps ++
diff --git 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.6.2
+sbt.version=1.7.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 // even updated `akka-grpc.version` in pom.xml files
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.4")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.6")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
-addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.10.0")
+addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.11.0")
diff --git a/samples/scala-customer-registry-quickstart/project/build.properties b/samples/scala-customer-registry-quickstart/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-doc-snippets/project/build.properties b/samples/scala-doc-snippets/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-eventsourced-counter/project/build.properties b/samples/scala-eventsourced-counter/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-eventsourced-customer-registry/project/build.properties b/samples/scala-eventsourced-customer-registry/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-eventsourced-shopping-cart/project/build.properties b/samples/scala-eventsourced-shopping-cart/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-fibonacci-action/project/build.properties b/samples/scala-fibonacci-action/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-first-service/project/build.properties b/samples/scala-first-service/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-reliable-timers/project/build.properties b/samples/scala-reliable-timers/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-replicatedentity-examples/project/build.properties b/samples/scala-replicatedentity-examples/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-replicatedentity-shopping-cart/project/build.properties b/samples/scala-replicatedentity-shopping-cart/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-valueentity-counter/project/build.properties b/samples/scala-valueentity-counter/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-valueentity-customer-registry/project/build.properties b/samples/scala-valueentity-customer-registry/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/samples/scala-valueentity-shopping-cart/project/build.properties b/samples/scala-valueentity-shopping-cart/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.2
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/ActionResultImpl.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/ActionResultImpl.scala
@@ -27,9 +27,9 @@ import java.util.{ List => JList }
 
 import io.grpc.Status
 
-import scala.collection.JavaConverters._
 import scala.compat.java8.FutureConverters._
 import scala.concurrent.ExecutionContext
+import scala.jdk.CollectionConverters._
 
 /**
  * INTERNAL API
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/MockRegistryImpl.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/MockRegistryImpl.scala
@@ -22,7 +22,7 @@ import scala.jdk.OptionConverters.RichOption
 
 private[kalix] class MockRegistryImpl(var mocks: Map[Class[_], Any]) extends MockRegistry {
 
-  def this(mocks: java.util.Map[Class[_], Any]) {
+  def this(mocks: java.util.Map[Class[_], Any]) = {
     this(mocks.asScala.toMap)
   }
 
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitActionContext.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitActionContext.scala
@@ -30,11 +30,11 @@ final class TestKitActionContext(metadata: Metadata, mockRegistry: MockRegistry
     with ActionCreationContext
     with InternalContext {
 
-  def this() {
+  def this() = {
     this(Metadata.EMPTY, MockRegistry.EMPTY)
   }
 
-  def this(metadata: Metadata) {
+  def this(metadata: Metadata) = {
     this(metadata, MockRegistry.EMPTY)
   }
 
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitEventSourcedEntityCommandContext.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitEventSourcedEntityCommandContext.scala
@@ -31,7 +31,7 @@ final class TestKitEventSourcedEntityCommandContext(
     extends CommandContext
     with InternalContext {
 
-  def this(metadata: Metadata) {
+  def this(metadata: Metadata) = {
     this(metadata = metadata, commandName = "stubCommandName")
   }
 
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitEventSourcedEntityContext.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitEventSourcedEntityContext.scala
@@ -29,7 +29,7 @@ final class TestKitEventSourcedEntityContext(
     extends AbstractTestKitContext(mockRegistry)
     with EventSourcedEntityContext {
 
-  def this(entityId: String) {
+  def this(entityId: String) = {
     this(entityId, MockRegistry.EMPTY)
   }
 
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitValueEntityCommandContext.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitValueEntityCommandContext.scala
@@ -33,7 +33,7 @@ final class TestKitValueEntityCommandContext(
     with ValueEntityContext
     with CommandContext {
 
-  def this(entityId: String, metadata: Metadata) {
+  def this(entityId: String, metadata: Metadata) = {
     this(entityId = entityId, metadata = metadata, commandName = "stubCommandName")
   }
 
diff --git a/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitValueEntityContext.scala b/sdk/java-sdk-testkit/src/main/scala/kalix/javasdk/testkit/impl/TestKitValueEntityContext.scala
@@ -27,7 +27,7 @@ final class TestKitValueEntityContext(override val entityId: String, mockRegistr
     extends AbstractTestKitContext(mockRegistry)
     with ValueEntityContext {
 
-  def this(entityId: String) {
+  def this(entityId: String) = {
     this(entityId, MockRegistry.EMPTY)
   }
 
diff --git a/sdk/java-sdk/src/main/scala/kalix/javasdk/KalixRunner.scala b/sdk/java-sdk/src/main/scala/kalix/javasdk/KalixRunner.scala
@@ -88,7 +88,7 @@ final class KalixRunner private[this] (
   /**
    * Creates a KalixRunner from the given services. Use the default config to create the internal ActorSystem.
    */
-  def this(services: java.util.Map[String, java.util.function.Function[ActorSystem, Service]], sdkName: String) {
+  def this(services: java.util.Map[String, java.util.function.Function[ActorSystem, Service]], sdkName: String) = {
     this(
       ActorSystem(
         "kalix", {
@@ -107,7 +107,7 @@ final class KalixRunner private[this] (
   def this(
       services: java.util.Map[String, java.util.function.Function[ActorSystem, Service]],
       config: Config,
-      sdkName: String) {
+      sdkName: String) = {
     this(ActorSystem("kalix", config.getConfig("kalix.system").withFallback(config)), services.asScala.toMap, sdkName)
   }
 
diff --git a/sdk/java-sdk/src/main/scala/kalix/javasdk/impl/PassivationStrategies.scala b/sdk/java-sdk/src/main/scala/kalix/javasdk/impl/PassivationStrategies.scala
@@ -22,11 +22,11 @@ import java.time.Duration
 
 private[kalix] case class Timeout private (duration: Option[Duration]) extends PassivationStrategy {
 
-  def this() {
+  def this() = {
     this(None) // use the timeout from the default or customized settings
   }
 
-  def this(duration: Duration) {
+  def this(duration: Duration) = {
     this(Some(duration))
   }
 }
diff --git a/sdk/scala-sdk-testkit/src/main/scala/kalix/scalasdk/testkit/impl/EventSourcedResultImpl.scala b/sdk/scala-sdk-testkit/src/main/scala/kalix/scalasdk/testkit/impl/EventSourcedResultImpl.scala
@@ -83,7 +83,7 @@ final class EventSourcedResultImpl[R, S](
   override def nextEvent[E](implicit expectedClass: ClassTag[E]): E =
     if (!eventsIterator.hasNext) throw new NoSuchElementException("No more events found")
     else {
-      @SuppressWarnings(Array("unchecked")) val next = eventsIterator.next
+      @SuppressWarnings(Array("unchecked")) val next = eventsIterator.next()
       if (expectedClass.runtimeClass.isInstance(next)) next.asInstanceOf[E]
       else
         throw new NoSuchElementException(

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	# update even the version in .circleci/config.yml `setup_sbt:`
`2`		`-sbt.version=1.6.2`
	`2`	`+sbt.version=1.7.2`