diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03b2b303..5ff975e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/setup-java@v3.13.0 with: distribution: temurin - java-version: '8' + java-version: '17' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 @@ -55,7 +55,7 @@ jobs: uses: actions/setup-java@v3.13.0 with: distribution: temurin - java-version: '8' + java-version: '17' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 @@ -70,10 +70,7 @@ jobs: strategy: fail-fast: false matrix: - java: - - '8' - - '11' - - '17' + java: ['11', '17', '21'] steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev @@ -107,7 +104,7 @@ jobs: uses: actions/setup-java@v3.13.0 with: distribution: temurin - java-version: '8' + java-version: '17' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 @@ -181,7 +178,7 @@ jobs: uses: actions/setup-java@v3.13.0 with: distribution: temurin - java-version: '8' + java-version: '17' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 @@ -210,7 +207,7 @@ jobs: uses: actions/setup-java@v3.13.0 with: distribution: temurin - java-version: '8' + java-version: '17' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 diff --git a/README.md b/README.md index 4df2ca73..5f784a73 100644 --- a/README.md +++ b/README.md @@ -140,10 +140,7 @@ test: strategy: fail-fast: false matrix: - java: - - '8' - - '11' - - '17' + java: ['11', '17', '21'] steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev @@ -171,12 +168,12 @@ In some cases, we may have multiple submodules in our project and we want to tes The `ciTargetScalaVersions` setting key is used to define a mapping of project names to the Scala versions that should be used for testing phase of continuous integration (CI). -For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows: +For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.12` and `3.3.1`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( "submoduleA" -> Seq("2.12.18"), - "submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0") + "submoduleB" -> Seq("2.12.18", "2.13.12", "3.3.1") ) ``` @@ -207,15 +204,12 @@ test: strategy: fail-fast: false matrix: - java: - - '8' - - '11' - - '17' + java: ['11', '17', '21'] scala-project: - ++2.12.18 submoduleA - ++2.12.18 submoduleB - - ++2.13.11 submoduleB - - ++3.3.0 submoduleB + - ++2.13.12 submoduleB + - ++3.3.1 submoduleB steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev diff --git a/docs/index.md b/docs/index.md index 5fbd6cb1..03165b30 100644 --- a/docs/index.md +++ b/docs/index.md @@ -138,11 +138,7 @@ test: continue-on-error: false strategy: fail-fast: false - matrix: - java: - - '8' - - '11' - - '17' + java: ['11', '17', '21'] steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev @@ -170,12 +166,12 @@ In some cases, we may have multiple submodules in our project and we want to tes The `ciTargetScalaVersions` setting key is used to define a mapping of project names to the Scala versions that should be used for testing phase of continuous integration (CI). -For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows: +For example, suppose we have a project with the name "submoduleA" and we want to test it against Scala `2.12.18`, and for the "submoduleB" we want to test it against Scala `2.12.18` and `2.13.12` and `3.3.1`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( "submoduleA" -> Seq("2.12.18"), - "submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0") + "submoduleB" -> Seq("2.12.18", "2.13.12", "3.3.1") ) ``` @@ -206,15 +202,12 @@ test: strategy: fail-fast: false matrix: - java: - - '8' - - '11' - - '17' + java: ['11', '17', '21'] scala-project: - ++2.12.18 submoduleA - ++2.12.18 submoduleB - - ++2.13.11 submoduleB - - ++3.3.0 submoduleB + - ++2.13.12 submoduleB + - ++3.3.1 submoduleB steps: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev diff --git a/project/Versions.scala b/project/Versions.scala index 536a8d11..01bee139 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -1,6 +1,6 @@ object Versions { val Scala212 = "2.12.18" - val Scala213 = "2.13.11" - val Scala3 = "3.3.0" - val zio = "2.0.16" + val Scala213 = "2.13.12" + val Scala3 = "3.3.1" + val zio = "2.0.17" } diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala index bca39e40..d333e0c0 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala @@ -22,11 +22,11 @@ object Versions { val KindProjectorVersion = "0.13.2" val ScaluzziVersion = "0.1.23" - val scala3 = "3.3.0" + val scala3 = "3.3.1" val scala212 = "2.12.18" - val scala213 = "2.13.11" + val scala213 = "2.13.12" - val zioVersion = "2.0.16" + val zioVersion = "2.0.17" lazy val betterMonadFor: ModuleID = "com.olegpy" %% "better-monadic-for" % "0.3.1" } diff --git a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml index 85ed6c5b..b710cb92 100644 --- a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml +++ b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/.github/workflows/ci.yml @@ -2,7 +2,6 @@ name: CI env: JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java - JVM_OPTS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC # for Java 8 only (sadly, it is not modern enough for JDK_JAVA_OPTIONS) NODE_OPTIONS: --max_old_space_size=6144 on: @@ -21,9 +20,9 @@ jobs: strategy: fail-fast: false matrix: - java: ['8', '11', '17'] + java: ['11', '17', '21'] # These version must be different than the versions in V.scala to verify that we are reading from the ci.yml file. - scala: ['2.12.18', '2.13.11', '3.3.0' ] + scala: ['2.12.18', '2.13.12', '3.3.1' ] steps: - uses: actions/checkout@v4.0.0 - uses: actions/setup-java@v3.12.0