diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..120c6893 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce0c39d9..28c24dfb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,13 @@ jobs: continue-on-error: true steps: - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: '8' @@ -47,13 +47,13 @@ jobs: continue-on-error: false steps: - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: '8' @@ -79,7 +79,7 @@ jobs: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: ${{ matrix.java }} @@ -87,7 +87,7 @@ jobs: - name: Cache Dependencies uses: coursier/cache-action@v6 - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Test @@ -99,13 +99,13 @@ jobs: if: ${{ github.event_name == 'push' }} steps: - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: '8' @@ -173,13 +173,13 @@ jobs: if: ${{ github.event_name != 'pull_request' }} steps: - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: '8' @@ -202,13 +202,13 @@ jobs: if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }} steps: - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: '8' @@ -233,7 +233,7 @@ jobs: if: ${{ (github.event_name == 'release') && (github.event.action == 'published') }} steps: - name: Git Checkout - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: notify the main repo about the new release of docs package diff --git a/README.md b/README.md index 10867a72..7aec881f 100644 --- a/README.md +++ b/README.md @@ -34,17 +34,16 @@ ZIO SBT Ecosystem plugin is an sbt plugin that provides a set of sbt settings an This pluging provides the following settings with default values: -- scala211 - scala212 - scala213 - scala3 -The default values are the latest stable versions of Scala 2.11, 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user. +The default values are the latest stable versions of Scala 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user. By having these settings, then we can use them in other sbt settings. For example, we can use them to define the `crossScalaVersions` setting: ```scala -crossScalaVersions := Seq(scala211.value, scala212.value, scala213.value, scala3.value) +crossScalaVersions := Seq(scala212.value, scala213.value, scala3.value) ``` There are also some other settings that are useful for configuring the projects: @@ -149,7 +148,7 @@ test: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: ${{ matrix.java }} @@ -157,7 +156,7 @@ test: - name: Cache Dependencies uses: coursier/cache-action@v6 - name: Git Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Test @@ -172,11 +171,11 @@ 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.11.12` and `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.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( - "submoduleA" -> Seq("2.11.12", "2.12.18"), + "submoduleA" -> Seq("2.12.18"), "submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0") ) ``` @@ -213,7 +212,6 @@ test: - '11' - '17' scala-project: - - ++2.11.12 submoduleA - ++2.12.18 submoduleA - ++2.12.18 submoduleB - ++2.13.11 submoduleB @@ -230,7 +228,7 @@ test: - name: Cache Dependencies uses: coursier/cache-action@v6 - name: Git Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Test diff --git a/docs/index.md b/docs/index.md index e8815a94..8deae066 100644 --- a/docs/index.md +++ b/docs/index.md @@ -33,17 +33,16 @@ ZIO SBT Ecosystem plugin is an sbt plugin that provides a set of sbt settings an This pluging provides the following settings with default values: -- scala211 - scala212 - scala213 - scala3 -The default values are the latest stable versions of Scala 2.11, 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user. +The default values are the latest stable versions of Scala 2.12, 2.13, and Scala 3. All of these settings are of type `String` and can be overridden by the user. By having these settings, then we can use them in other sbt settings. For example, we can use them to define the `crossScalaVersions` setting: ```scala -crossScalaVersions := Seq(scala211.value, scala212.value, scala213.value, scala3.value) +crossScalaVersions := Seq(scala212.value, scala213.value, scala3.value) ``` There are also some other settings that are useful for configuring the projects: @@ -148,7 +147,7 @@ test: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.12.0 with: distribution: temurin java-version: ${{ matrix.java }} @@ -156,7 +155,7 @@ test: - name: Cache Dependencies uses: coursier/cache-action@v6 - name: Git Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Test @@ -171,11 +170,11 @@ 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.11.12` and `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.11` and `3.3.0`, We can define the `ciTargetScalaVersions` setting as follows: ```scala ThisBuild / ciTargetScalaVersions := Map( - "submoduleA" -> Seq("2.11.12", "2.12.18"), + "submoduleA" -> Seq("2.12.18"), "submoduleB" -> Seq("2.12.18", "2.13.11", "3.3.0") ) ``` @@ -212,7 +211,6 @@ test: - '11' - '17' scala-project: - - ++2.11.12 submoduleA - ++2.12.18 submoduleA - ++2.12.18 submoduleB - ++2.13.11 submoduleB @@ -229,7 +227,7 @@ test: - name: Cache Dependencies uses: coursier/cache-action@v6 - name: Git Checkout - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.6.0 with: fetch-depth: '0' - name: Test diff --git a/project/Versions.scala b/project/Versions.scala index 98a8b092..536a8d11 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -1,7 +1,6 @@ object Versions { - val Scala211 = "2.11.12" val Scala212 = "2.12.18" val Scala213 = "2.13.11" val Scala3 = "3.3.0" - val zio = "2.0.15" + val zio = "2.0.16" } diff --git a/project/build.properties b/project/build.properties index 40b3b8e7..30409871 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index 12fc1374..0efab9ac 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,16 +1,16 @@ // Build Server Plugins -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.10") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") -addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") +addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") // Versioning and Release Plugins addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") // Docs Plugins @@ -19,15 +19,15 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") // Cross-Compiler Plugins -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0") -addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") +addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.2") // Benchmarking Plugins addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5") -libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6" -libraryDependencies += "dev.zio" %% "zio" % "2.0.15" +libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.7" +libraryDependencies += "dev.zio" %% "zio" % "2.0.16" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-ci/build.sbt b/zio-sbt-ci/build.sbt index fabba6d8..a46a58ce 100644 --- a/zio-sbt-ci/build.sbt +++ b/zio-sbt-ci/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "dev.zio" %% "zio" % "2.0.15" +libraryDependencies += "dev.zio" %% "zio" % "2.0.16" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-ci/src/main/scala/zio/sbt/V.scala b/zio-sbt-ci/src/main/scala/zio/sbt/V.scala index 906ae869..cd9a98ce 100644 --- a/zio-sbt-ci/src/main/scala/zio/sbt/V.scala +++ b/zio-sbt-ci/src/main/scala/zio/sbt/V.scala @@ -6,8 +6,8 @@ object V { "peter-evans/create-pull-request" -> "v5.0.0", "zio/generate-github-app-token" -> "v1.0.0", "pierotofy/set-swap-space" -> "master", - "actions/checkout" -> "v3.5.0", - "actions/setup-java" -> "v3.11.0", + "actions/checkout" -> "v3.6.0", + "actions/setup-java" -> "v3.12.0", "coursier/cache-action" -> "v6", "actions/setup-node" -> "v3" ).map { case (k, v) => (k, s"$k@$v") }.apply(packageName) diff --git a/zio-sbt-ecosystem/build.sbt b/zio-sbt-ecosystem/build.sbt index a26077fb..96f38dfd 100644 --- a/zio-sbt-ecosystem/build.sbt +++ b/zio-sbt-ecosystem/build.sbt @@ -1,16 +1,16 @@ // Build Server Plugins -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.10") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") -addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") +addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") // Versioning and Release Plugins addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") // Docs Plugins @@ -19,19 +19,19 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") // Cross-Compiler Plugins -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0") -addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") +addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.2") // Benchmarking Plugins addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5") addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0") // Binary Compatibility Plugin -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") -libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6" -libraryDependencies += "dev.zio" %% "zio" % "2.0.15" +libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.7" +libraryDependencies += "dev.zio" %% "zio" % "2.0.16" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala index b025676e..43cf2c0d 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala @@ -114,21 +114,6 @@ trait ScalaCompilerSettings { "-Xmax-classfile-name", "242" ) ++ std2xOptions ++ optimizerOptions(optimize) - case Some((2, 11)) => - Seq( - "-Ypartial-unification", - "-Yno-adapted-args", - "-Ywarn-inaccessible", - "-Ywarn-infer-any", - "-Ywarn-nullary-override", - "-Ywarn-nullary-unit", - "-Xexperimental", - "-Ywarn-unused-import", - "-Xfuture", - "-Xsource:2.13", - "-Xmax-classfile-name", - "242" - ) ++ std2xOptions case _ => Seq.empty } @@ -142,14 +127,12 @@ trait ScalaCompilerSettings { def crossPlatformSources(scalaVer: String, platform: String, conf: String, baseDir: File): List[File] = { val versions = CrossVersion.partialVersion(scalaVer) match { - case Some((2, 11)) => - List("2.11", "2.11+", "2.11-2.12", "2.x") case Some((2, 12)) => - List("2.12", "2.11+", "2.12+", "2.11-2.12", "2.12-2.13", "2.x") + List("2.12", "2.12+", "2.12-2.13", "2.x") case Some((2, 13)) => - List("2.13", "2.11+", "2.12+", "2.13+", "2.12-2.13", "2.x") + List("2.13", "2.12+", "2.13+", "2.12-2.13", "2.x") case Some((3, _)) => - List("dotty", "2.11+", "2.12+", "2.13+", "3.x") + List("dotty", "2.12+", "2.13+", "3.x") case _ => List() } @@ -175,17 +158,10 @@ trait ScalaCompilerSettings { } ) - val silencerModules: Seq[ModuleID] = - Seq( - "com.github.ghik" % "silencer-lib" % SilencerVersion % Provided cross CrossVersion.full, - compilerPlugin("com.github.ghik" % "silencer-plugin" % SilencerVersion cross CrossVersion.full) - ) - def stdSettings( name: Option[String] = None, packageName: Option[String] = None, javaPlatform: String = "8", - enableSilencer: Boolean = true, enableKindProjector: Boolean = true, enableCrossProject: Boolean = false, enableScalafix: Boolean = true, @@ -210,19 +186,6 @@ trait ScalaCompilerSettings { // Compile / console / scalacOptions ~= { // _.filterNot(Set("-Xfatal-warnings")) // }, - libraryDependencies ++= { - if (enableSilencer) { - if (scalaBinaryVersion.value == "3") - Seq( - "com.github.ghik" % s"silencer-lib_${ZioSbtEcosystemPlugin.autoImport.scala213.value}" % SilencerVersion % Provided - ) - else - Seq( - "com.github.ghik" % "silencer-lib" % SilencerVersion % Provided cross CrossVersion.full, - compilerPlugin("com.github.ghik" % "silencer-plugin" % SilencerVersion cross CrossVersion.full) - ) - } else Seq.empty - }, libraryDependencies ++= { if (enableKindProjector && scalaBinaryVersion.value != "3") { Seq( @@ -250,8 +213,7 @@ trait ScalaCompilerSettings { semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(Keys.scalaVersion.value), ThisBuild / scalafixDependencies ++= List( - "com.github.liancheng" %% "organize-imports" % OrganizeImportsVersion, - "com.github.vovapolu" %% "scaluzzi" % ScaluzziVersion + "com.github.vovapolu" %% "scaluzzi" % ScaluzziVersion ) ) @@ -292,7 +254,7 @@ trait ScalaCompilerSettings { def macroExpansionSettings: Seq[Setting[_]] = Seq( addOptionsOn("2.13")("-Ymacro-annotations"), - addDependenciesOn("2.11", "2.12")( + addDependenciesOn("2.12")( compilerPlugin(("org.scalamacros" % "paradise" % "2.1.1").cross(CrossVersion.full)) ) ) @@ -333,7 +295,7 @@ trait ScalaCompilerSettings { optionsOnOrElse(scalaBinaryVersions*)(options*)(Seq.empty*) def optionsOnExcept(scalaBinaryVersions: String*)(options: String*): Def.Initialize[Seq[String]] = - optionsOn(Seq("2.11", "2.12", "2.13", "3").diff(scalaBinaryVersions)*)(options*) + optionsOn(Seq("2.12", "2.13", "3").diff(scalaBinaryVersions)*)(options*) def optionsOnOrElse(scalaBinaryVersions: String*)(defaults: String*)( orElse: String* @@ -346,7 +308,7 @@ trait ScalaCompilerSettings { dependenciesOnOrElse(scalaBinaryVersions*)(modules*)(Seq.empty*) def dependenciesOnExcept(scalaBinaryVersions: String*)(modules: ModuleID*): Def.Initialize[Seq[ModuleID]] = - dependenciesOn(Seq("2.11", "2.12", "2.13", "3").diff(scalaBinaryVersions)*)(modules*) + dependenciesOn(Seq("2.12", "2.13", "3").diff(scalaBinaryVersions)*)(modules*) def dependenciesOnOrElse(scalaBinaryVersions: String*)(defaultModules: ModuleID*)( orElse: ModuleID* @@ -359,7 +321,7 @@ trait ScalaCompilerSettings { addDependenciesOnOrElse(scalaBinaryVersions*)(dependencies*)(Seq.empty*) def addDependenciesOnExcept(scalaBinaryVersions: String*)(dependencies: ModuleID*): Def.Setting[Seq[ModuleID]] = - libraryDependencies ++= dependenciesOn(Seq("2.11", "2.12", "2.13", "3").diff(scalaBinaryVersions)*)( + libraryDependencies ++= dependenciesOn(Seq("2.12", "2.13", "3").diff(scalaBinaryVersions)*)( dependencies* ).value @@ -377,6 +339,6 @@ trait ScalaCompilerSettings { scalacOptions ++= optionsOnOrElse(scalaBinaryVersions*)(options*)(orElse*).value def addOptionsOnExcept(scalaBinaryVersions: String*)(options: String*): Def.Setting[Task[Seq[String]]] = - addOptionsOn(Seq("2.11", "2.12", "2.13", "3").diff(scalaBinaryVersions)*)(options*) + addOptionsOn(Seq("2.12", "2.13", "3").diff(scalaBinaryVersions)*)(options*) } 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 9051a94a..dea3bca3 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala @@ -17,15 +17,12 @@ package zio.sbt object Versions { - val KindProjectorVersion = "0.13.2" - val SilencerVersion = "1.7.13" - val ScaluzziVersion = "0.1.23" - val OrganizeImportsVersion = "0.6.0" + val KindProjectorVersion = "0.13.2" + val ScaluzziVersion = "0.1.23" val scala3 = "3.3.0" - val scala211 = "2.11.12" val scala212 = "2.12.18" val scala213 = "2.13.11" - val zioVersion = "2.0.15" + val zioVersion = "2.0.16" } diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala index 21cc9418..0da1f111 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala @@ -48,7 +48,6 @@ object ZioSbtEcosystemPlugin extends AutoPlugin { ) lazy val scala3: SettingKey[String] = settingKey[String]("Scala 3 version") - lazy val scala211: SettingKey[String] = settingKey[String]("Scala 2.11 version") lazy val scala212: SettingKey[String] = settingKey[String]("Scala 2.12 version") lazy val scala213: SettingKey[String] = settingKey[String]("Scala 2.13 version") lazy val zioVersion: SettingKey[String] = settingKey[String]("ZIO version") @@ -105,11 +104,10 @@ object ZioSbtEcosystemPlugin extends AutoPlugin { override def buildSettings: Seq[Def.Setting[_]] = super.buildSettings ++ Seq( scala3 := Versions.scala3, - scala211 := Versions.scala211, scala212 := Versions.scala212, scala213 := Versions.scala213, scalaVersion := scala213.value, - crossScalaVersions := Seq(scala211.value, scala212.value, scala213.value, scala3.value), + crossScalaVersions := Seq(scala212.value, scala213.value, scala3.value), zioVersion := Versions.zioVersion, javaPlatform := "8" ) diff --git a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/build.sbt b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/build.sbt index 810b3675..9ca9f65f 100644 --- a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/build.sbt +++ b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/build.sbt @@ -1,4 +1,3 @@ - lazy val root = (project in file(".")) .settings( version := "0.1", diff --git a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/project/plugins.sbt b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/project/plugins.sbt index 8a94befd..c66338d9 100644 --- a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/project/plugins.sbt +++ b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettings/project/plugins.sbt @@ -1,5 +1,5 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % x) - case _ => sys.error("""|The system property 'plugin.version' is not defined. + case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } 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 938f9436..58f3b7d6 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 @@ -21,14 +21,16 @@ jobs: strategy: fail-fast: false matrix: - java: ['adopt@1.8', 'adopt@1.11'] + java: ['8', '11', '17'] # 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.16', '2.13.9', '3.2.0' ] + scala: ['2.12.18', '2.13.11', '3.3.0' ] steps: - - uses: actions/checkout@v3.2.0 - - uses: olafurpg/setup-scala@v13 + - uses: actions/checkout@v3.6.0 + - uses: actions/setup-java@v3.12.0 with: + distribution: temurin java-version: ${{ matrix.java }} + check-latest: true - name: Cache scala dependencies uses: coursier/cache-action@v6 - name: Run tests diff --git a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/project/plugins.sbt b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/project/plugins.sbt index 8a94befd..c66338d9 100644 --- a/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/project/plugins.sbt +++ b/zio-sbt-ecosystem/src/sbt-test/zio-sbt-ecosystem/verifySettingsWithCI/project/plugins.sbt @@ -1,5 +1,5 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % x) - case _ => sys.error("""|The system property 'plugin.version' is not defined. + case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } diff --git a/zio-sbt-githubactions/build.sbt b/zio-sbt-githubactions/build.sbt index fabba6d8..a46a58ce 100644 --- a/zio-sbt-githubactions/build.sbt +++ b/zio-sbt-githubactions/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "dev.zio" %% "zio" % "2.0.15" +libraryDependencies += "dev.zio" %% "zio" % "2.0.16" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-website/build.sbt b/zio-sbt-website/build.sbt index 7bbdd65e..80dc4d3c 100644 --- a/zio-sbt-website/build.sbt +++ b/zio-sbt-website/build.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") -libraryDependencies += "dev.zio" %% "zio" % "2.0.15" +libraryDependencies += "dev.zio" %% "zio" % "2.0.16" libraryDependencies += "io.circe" %% "circe-yaml" % "0.14.2" diff --git a/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/build.sbt b/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/build.sbt index 5146564b..b7765627 100644 --- a/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/build.sbt +++ b/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/build.sbt @@ -1,7 +1,8 @@ lazy val root = (project in file(".")) .settings( - version := "0.1", - projectName := "ZIO SBT", + version := "0.1", + projectName := "ZIO SBT", mainModuleName := "test-project", - projectStage := ProjectStage.ProductionReady, - ).enablePlugins(WebsitePlugin) + projectStage := ProjectStage.ProductionReady + ) + .enablePlugins(WebsitePlugin) diff --git a/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/project/plugins.sbt b/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/project/plugins.sbt index 7898c520..74798f8c 100644 --- a/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/project/plugins.sbt +++ b/zio-sbt-website/src/sbt-test/zio-sbt-website/compileDocs/project/plugins.sbt @@ -1,5 +1,5 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("dev.zio" % "zio-sbt-website" % x) - case _ => sys.error("""|The system property 'plugin.version' is not defined. + case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } diff --git a/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/build.sbt b/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/build.sbt index 5146564b..b7765627 100644 --- a/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/build.sbt +++ b/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/build.sbt @@ -1,7 +1,8 @@ lazy val root = (project in file(".")) .settings( - version := "0.1", - projectName := "ZIO SBT", + version := "0.1", + projectName := "ZIO SBT", mainModuleName := "test-project", - projectStage := ProjectStage.ProductionReady, - ).enablePlugins(WebsitePlugin) + projectStage := ProjectStage.ProductionReady + ) + .enablePlugins(WebsitePlugin) diff --git a/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/project/plugins.sbt b/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/project/plugins.sbt index 7898c520..74798f8c 100644 --- a/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/project/plugins.sbt +++ b/zio-sbt-website/src/sbt-test/zio-sbt-website/installWebsite/project/plugins.sbt @@ -1,5 +1,5 @@ sys.props.get("plugin.version") match { case Some(x) => addSbtPlugin("dev.zio" % "zio-sbt-website" % x) - case _ => sys.error("""|The system property 'plugin.version' is not defined. + case _ => sys.error("""|The system property 'plugin.version' is not defined. |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) }