update build (#107)

* update build * Update integration-tests-kafka.yml * Update SlickProjectionImpl.scala * rework resolvers
apache · Feb 12, 2024 · 04be28f · 04be28f
1 parent 9e51b48
commit 04be28f
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 57 deletions.
diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml
@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 8,  scala-version: 2.13.11,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.13.11,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,  scala-version: 2.12.18,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.12.18,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.13,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.13,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.12,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.12,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml
@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 8,  scala-version: 2.13.11,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.13.11,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,  scala-version: 2.12.18,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.12.18,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.13,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.13,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.12,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.12,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 8,  scala-version: 2.13.11,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.13.11,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,  scala-version: 2.12.18,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.12.18,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.13,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.13,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.12,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.12,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml
@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 8,  scala-version: 2.13.11,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.13.11,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,  scala-version: 2.12.18,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.12.18,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.13,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.13,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.12,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.12,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,12 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 8,  scala-version: 2.13.11,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.13.11,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,  scala-version: 2.12.18,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 2.12.18,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: 8,  scala-version: 3.3.1,  sbt-opts: '' }
-          - { java-version: 11, scala-version: 3.3.1,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.13,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.13,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 2.12,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 2.12,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 8,  scala-version: 3.3,  sbt-opts: '' }
+          - { java-version: 11, scala-version: 3.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/build.sbt b/build.sbt
@@ -15,6 +15,8 @@ sourceDistName := "apache-pekko-projection"
 sourceDistIncubating := true
 
 ThisBuild / pekkoInlineEnabled := false
+// we want to be able to test with snapshot versions of Pekko dependencies
+ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
 ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo
 
 lazy val core =

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -14,7 +14,7 @@ import sbt._
 
 object Dependencies {
 
-  val Scala213 = "2.13.11"
+  val Scala213 = "2.13.12"
   val Scala212 = "2.12.18"
   val Scala3 = "3.3.1"
   val Scala2Versions = Seq(Scala213, Scala212)
@@ -28,14 +28,15 @@ object Dependencies {
     val pekko = PekkoCoreDependency.version
     val pekkoPersistenceJdbc = "1.0.0"
     val pekkoPersistenceCassandra = "1.0.0"
-    val connectors = "1.0.1"
-    val connectorsKafka = sys.props.getOrElse("build.connectors.kafka.version", "1.0.0")
+    val connectors = PekkoConnectorsDependency.version
+    val connectorsKafka = PekkoConnectorsKafkaDependency.version
     val slick = "3.3.3"
     val scalaTest = "3.2.14"
     val testContainers = "1.15.3"
     val junit = "4.13.2"
-    val h2Driver = "2.2.220"
+    val h2Driver = "2.2.224"
     val jackson = "2.14.3" // this should match the version of jackson used by pekko-serialization-jackson
+    val logback = "1.2.13"
   }
 
   object Compile {
@@ -78,7 +79,7 @@ object Dependencies {
     val msSQLServerDriver = "com.microsoft.sqlserver" % "mssql-jdbc" % "7.4.1.jre8" % allTestConfig
     val oracleDriver = "com.oracle.ojdbc" % "ojdbc8" % "19.3.0.0" % allTestConfig
 
-    val logback = "ch.qos.logback" % "logback-classic" % "1.2.11" % allTestConfig
+    val logback = "ch.qos.logback" % "logback-classic" % Versions.logback % allTestConfig
 
     val cassandraContainer =
       "org.testcontainers" % "cassandra" % Versions.testContainers % allTestConfig

diff --git a/project/PekkoConnectorsDependency.scala b/project/PekkoConnectorsDependency.scala
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pekko.projections
+
+import com.github.pjfanning.pekkobuild.PekkoDependency
+
+object PekkoConnectorsDependency extends PekkoDependency {
+  override val checkProject: String = "pekko-connectors-cassandra"
+  override val module: Option[String] = Some("connectors")
+  override val currentVersion: String = "1.0.2"
+}
diff --git a/project/PekkoConnectorsKafkaDependency.scala b/project/PekkoConnectorsKafkaDependency.scala
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pekko.projections
+
+import com.github.pjfanning.pekkobuild.PekkoDependency
+
+object PekkoConnectorsKafkaDependency extends PekkoDependency {
+  override val checkProject: String = "pekko-connectors-kafka-testkit"
+  override val module: Option[String] = Some("connectors.kafka")
+  override val currentVersion: String = "1.0.0"
+}
diff --git a/project/PekkoSnapshotRepository.scala b/project/PekkoSnapshotRepository.scala
diff --git a/slick/src/main/scala/org/apache/pekko/projection/slick/internal/SlickProjectionImpl.scala b/slick/src/main/scala/org/apache/pekko/projection/slick/internal/SlickProjectionImpl.scala
@@ -198,7 +198,7 @@ private[projection] class SlickProjectionImpl[Offset, Envelope, P <: JdbcProfile
       databaseConfig.db.run(offsetStore.saveOffset(projectionId, offset)).map(_ => Done)
 
     private[projection] def newRunningInstance(): RunningProjection =
-      new SlickRunningProjection(RunningProjection.withBackoff(() => mappedSource(), settings), this)
+      new SlickRunningProjection(RunningProjection.withBackoff(() => this.mappedSource(), settings), this)
 
   }