Fix IntegrationTest deprecation warnings (#889)

zio · Sep 27, 2023 · ff0d169 · ff0d169
1 parent 05a03a5
commit ff0d169
Show file tree

Hide file tree

Showing 30 changed files with 316 additions and 294 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@
 name: CI
 env:
   JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags
-  JVM_OPTS: -XX:+PrintCommandLineFlags
 'on':
   workflow_dispatch: {}
   release:
@@ -14,7 +13,6 @@ env:
     branches:
     - master
   pull_request: {}
-  create: {}
 jobs:
   build:
     name: Build
@@ -30,8 +28,8 @@ jobs:
     - name: Setup Scala
       uses: actions/setup-java@v3.13.0
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
@@ -55,8 +53,8 @@ jobs:
     - name: Setup Scala
       uses: actions/setup-java@v3.13.0
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
@@ -72,16 +70,16 @@ jobs:
       fail-fast: false
       matrix:
         java:
-        - '8'
         - '11'
         - '17'
+        - '21'
     steps:
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
     - name: Setup Scala
       uses: actions/setup-java@v3.13.0
       with:
-        distribution: temurin
+        distribution: corretto
         java-version: ${{ matrix.java }}
         check-latest: true
     - name: Cache Dependencies
@@ -92,12 +90,6 @@ jobs:
         fetch-depth: '0'
     - name: Test
       run: sbt +test
-    - name: Run Redis
-      run: docker-compose -f docker/redis-compose.yml up -d
-    - name: Run Redis cluster
-      run: docker-compose -f docker/redis-cluster-compose.yml up -d
-    - name: Run integration tests
-      run: sbt ++${{ matrix.scala }} IntegrationTest/test
   update-readme:
     name: Update README
     runs-on: ubuntu-latest
@@ -113,8 +105,8 @@ jobs:
     - name: Setup Scala
       uses: actions/setup-java@v3.13.0
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
@@ -187,8 +179,8 @@ jobs:
     - name: Setup Scala
       uses: actions/setup-java@v3.13.0
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
     - name: Cache Dependencies
       uses: coursier/cache-action@v6
@@ -216,8 +208,8 @@ jobs:
     - name: Setup Scala
       uses: actions/setup-java@v3.13.0
       with:
-        distribution: temurin
-        java-version: '8'
+        distribution: corretto
+        java-version: '17'
         check-latest: true
     - name: Cache Dependencies
       uses: coursier/cache-action@v6

diff --git a/build.sbt b/build.sbt
@@ -1,29 +1,12 @@
+import zio.sbt.githubactions.Job
 import zio.sbt.githubactions.Step.SingleStep
 
 enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)
 
 inThisBuild(
   List(
     name              := "ZIO Redis",
-    zioVersion        := "2.0.16",
-    scala212          := "2.12.18",
-    scala213          := "2.13.11",
-    scala3            := "3.3.1",
     ciEnabledBranches := List("master"),
-    ciExtraTestSteps  := List(
-      SingleStep(
-        name = "Run Redis",
-        run = Some("docker-compose -f docker/redis-compose.yml up -d")
-      ),
-      SingleStep(
-        name = "Run Redis cluster",
-        run = Some("docker-compose -f docker/redis-cluster-compose.yml up -d")
-      ),
-      SingleStep(
-        name = "Run integration tests",
-        run = Some("sbt ++${{ matrix.scala }} IntegrationTest/test")
-      )
-    ),
     developers        := List(
       Developer("jdegoes", "John De Goes", "john@degoes.net", url("https://degoes.net")),
       Developer("mijicd", "Dejan Mijic", "dmijic@acm.org", url("https://github.com/mijicd"))
@@ -40,48 +23,27 @@ lazy val root =
       crossScalaVersions := Nil,
       publish / skip     := true
     )
-    .aggregate(redis, embedded, benchmarks, example, docs)
-
-lazy val redis =
-  project
-    .in(file("modules/redis"))
-    .settings(addOptionsOn("2.13")("-Xlint:-infer-any"))
-    .settings(stdSettings(name = Some("zio-redis"), packageName = Some("zio.redis")))
-    .settings(enableZIO(enableStreaming = true))
-    .settings(libraryDependencies ++= Dependencies.redis(zioVersion.value))
-    .settings(Defaults.itSettings)
-    .configs(IntegrationTest)
-
-lazy val embedded =
-  project
-    .in(file("modules/embedded"))
-    .settings(stdSettings(name = Some("zio-redis-embedded"), packageName = Some("zio.redis.embedded")))
-    .settings(enableZIO())
-    .settings(libraryDependencies ++= Dependencies.Embedded)
-    .dependsOn(redis)
+    .aggregate(benchmarks, client, docs, embedded, example, integrationTest)
 
 lazy val benchmarks =
   project
     .in(file("modules/benchmarks"))
     .enablePlugins(JmhPlugin)
-    .dependsOn(redis)
+    .dependsOn(client)
     .settings(stdSettings(name = Some("benchmarks"), packageName = Some("zio.redis.benchmarks")))
     .settings(
       crossScalaVersions -= scala3.value,
       libraryDependencies ++= Dependencies.Benchmarks,
       publish / skip := true
     )
 
-lazy val example =
+lazy val client =
   project
-    .in(file("modules/example"))
-    .dependsOn(redis)
-    .settings(stdSettings(name = Some("example"), packageName = Some("zio.redis.example")))
+    .in(file("modules/redis"))
+    .settings(addOptionsOn("2.13")("-Xlint:-infer-any"))
+    .settings(stdSettings(name = Some("zio-redis"), packageName = Some("zio.redis")))
     .settings(enableZIO(enableStreaming = true))
-    .settings(
-      publish / skip := true,
-      libraryDependencies ++= Dependencies.Example
-    )
+    .settings(libraryDependencies ++= Dependencies.redis(zioVersion.value))
 
 lazy val docs = project
   .in(file("zio-redis-docs"))
@@ -93,9 +55,40 @@ lazy val docs = project
   .settings(
     moduleName                                 := "zio-redis-docs",
     projectName                                := (ThisBuild / name).value,
-    mainModuleName                             := (redis / moduleName).value,
+    mainModuleName                             := (client / moduleName).value,
     projectStage                               := ProjectStage.Development,
-    ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(redis)
+    ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(client)
   )
-  .dependsOn(redis, embedded)
+  .dependsOn(client, embedded)
   .enablePlugins(WebsitePlugin)
+
+lazy val embedded =
+  project
+    .in(file("modules/embedded"))
+    .settings(stdSettings(name = Some("zio-redis-embedded"), packageName = Some("zio.redis.embedded")))
+    .settings(enableZIO())
+    .settings(libraryDependencies ++= Dependencies.Embedded)
+    .dependsOn(client)
+
+lazy val example =
+  project
+    .in(file("modules/example"))
+    .dependsOn(client)
+    .settings(stdSettings(name = Some("example"), packageName = Some("zio.redis.example")))
+    .settings(enableZIO(enableStreaming = true))
+    .settings(
+      publish / skip := true,
+      libraryDependencies ++= Dependencies.Example
+    )
+
+lazy val integrationTest =
+  project
+    .in(file("modules/redis-it"))
+    .settings(stdSettings(name = Some("zio-redis-it")))
+    .settings(enableZIO(enableStreaming = true))
+    .settings(
+      libraryDependencies ++= Dependencies.redis(zioVersion.value),
+      publish / skip := true,
+      Test / fork := false
+    )
+    .dependsOn(client)
diff --git a/docker/redis-cluster-compose.yml b/docker/redis-cluster-compose.yml
diff --git a/docker/redis-cluster.sh b/docker/redis-cluster.sh
diff --git a/docker/redis-compose.yml b/docker/redis-compose.yml
diff --git a/modules/redis-it/src/test/resources/docker-compose.yml b/modules/redis-it/src/test/resources/docker-compose.yml
@@ -0,0 +1,56 @@
+version: "3.3"
+
+services:
+  single-node-0:
+    image: bitnami/redis:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+
+  single-node-1:
+    image: bitnami/redis:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+
+  cluster-node-0:
+    image: bitnami/redis-cluster:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_NODES=cluster-node-0 cluster-node-1 cluster-node-2 cluster-node-3 cluster-node-4 cluster-node-5'
+
+  cluster-node-1:
+    image: bitnami/redis-cluster:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_NODES=cluster-node-0 cluster-node-1 cluster-node-2 cluster-node-3 cluster-node-4 cluster-node-5'
+
+  cluster-node-2:
+    image: bitnami/redis-cluster:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_NODES=cluster-node-0 cluster-node-1 cluster-node-2 cluster-node-3 cluster-node-4 cluster-node-5'
+
+  cluster-node-3:
+    image: bitnami/redis-cluster:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_NODES=cluster-node-0 cluster-node-1 cluster-node-2 cluster-node-3 cluster-node-4 cluster-node-5'
+
+  cluster-node-4:
+    image: bitnami/redis-cluster:7.2
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_NODES=cluster-node-0 cluster-node-1 cluster-node-2 cluster-node-3 cluster-node-4 cluster-node-5'
+
+  cluster-node-5:
+    image: bitnami/redis-cluster:7.2
+    depends_on:
+      - cluster-node-0
+      - cluster-node-1
+      - cluster-node-2
+      - cluster-node-3
+      - cluster-node-4
+    environment:
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_CLUSTER_REPLICAS=1'
+      - 'REDIS_NODES=cluster-node-0 cluster-node-1 cluster-node-2 cluster-node-3 cluster-node-4 cluster-node-5'
+      - 'REDIS_CLUSTER_CREATOR=yes'