Standardise naming

.github/workflows/check-build-test.yml

@@ -80,8 +80,8 @@ jobs:
           jvm: temurin:1.11
 
       - name: Compile all code with fatal warnings for Java 11 and all Scala versions
-        # Run locally with: env CI=true sbt 'clean ; Test/compile'
-        run: sbt "+Test/compile"
+        # Run locally with: env CI=true sbt 'clean ; Test/compile; integration-tests/Test/compile'
+        run: sbt "+Test/compile; +integration-tests/Test/compile"
 
   check-docs:
     name: Check Docs
@@ -116,15 +116,15 @@ jobs:
         # Run locally with: sbt verifyDocs
         run: sbt docs/makeSite
 
-  test:
+  tests:
     name: Build and Test
     runs-on: ubuntu-22.04
     needs: [check-code-style, check-code-compilation, check-docs]
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 'temurin:1.11', sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 'temurin:1.11', sbt-opts: '-J-XX:+UnlockExperimentalVMOptions' }
     steps:
       - name: Checkout
         # https://github.com/actions/checkout/releases
@@ -158,7 +158,7 @@ jobs:
         if: ${{ failure() }}
         run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
 
-  integration-test:
+  integration-tests:
     name: Integration tests
     needs: [check-code-style, check-code-compilation, check-docs]
     runs-on: ubuntu-22.04
@@ -189,11 +189,12 @@ jobs:
           jvm: temurin:1.11
 
       - name: Run multi-broker and long running integration tests
-        run: sbt "integrationTests/test"
+        run: sbt "integration-tests/test"
 
       - name: Print logs on failure
         if: ${{ failure() }}
         run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \;
+
   build-benchmark:
     name: Build benchmarks
     needs: [check-code-style, check-code-compilation, check-docs]

build.sbt

@@ -172,8 +172,7 @@ lazy val `alpakka-kafka` =
     .settings(commonSettings)
     .settings(
       publish / skip := true,
-      // TODO: add clusterSharding to unidocProjectFilter when we drop support for Akka 2.5
-      ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(core, testkit),
+      ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(core, testkit, `cluster-sharding`),
       onLoadMessage :=
         """
             |** Welcome to the Alpakka Kafka connector! **
@@ -203,7 +202,7 @@ lazy val `alpakka-kafka` =
             |  test
             |    runs all the tests, most using Kafka in TestContainers
             |
-            |  integrationTests/test
+            |  integration-tests/test
             |    run integration tests using multiple Kafka brokers via TestContainers
             |
             |  tests/testOnly -- -t "A consume-transform-produce cycle must complete in happy-path scenario"
@@ -213,7 +212,7 @@ lazy val `alpakka-kafka` =
             |    run a single benchmark backed by Docker containers
           """.stripMargin
     )
-    .aggregate(core, testkit, clusterSharding, tests, integrationTests, benchmarks, docs)
+    .aggregate(core, testkit, `cluster-sharding`, tests, benchmarks, docs)
 
 lazy val core = project
   .enablePlugins(AutomateHeaderPlugin)
@@ -260,8 +259,7 @@ lazy val testkit = project
   )
   .settings(Scala3Settings)
 
-lazy val clusterSharding = project
-  .in(file("./cluster-sharding"))
+lazy val `cluster-sharding` = project
   .dependsOn(core)
   .enablePlugins(AutomateHeaderPlugin)
   .disablePlugins(SitePlugin, CiReleasePlugin)
@@ -280,7 +278,7 @@ lazy val clusterSharding = project
   .settings(Scala3Settings)
 
 lazy val tests = project
-  .dependsOn(core, testkit, clusterSharding)
+  .dependsOn(core, testkit, `cluster-sharding`)
   .enablePlugins(AutomateHeaderPlugin)
   .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin)
   .settings(commonSettings)
@@ -318,7 +316,8 @@ lazy val tests = project
     Test / parallelExecution := false
   )
 
-lazy val integrationTests = project
+
+lazy val `integration-tests` = project
   .dependsOn(core, testkit, tests)
   .enablePlugins(AutomateHeaderPlugin)
   .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin)