Skip to content

Commit

Permalink
Fix publishing: remove dependency on `"io.github.cquiroz" %%% "scala-…
Browse files Browse the repository at this point in the history
…java-time"` (Not published for Scala2.11) (#129)

* Fix publishing: remove dependency on `"io.github.cquiroz" %%% "scala-java-time"` (Not published for Scala2.11)

* Bring back CI test for ScalaJS 2.11

* Update zio-sbt-website

* Fix publishing: Try deactivate doc in Scala2.11

* Fix publishing for Scala 2.11

* Update ZIO version to `2.0.6`

* trigger CI
  • Loading branch information
guizmaii authored Jan 17, 2023
1 parent c07a615 commit 960d3f4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,11 @@ jobs:
check-latest: true
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Run Scala 2.11
if: ${{ startsWith(matrix.scala, '2.11.') && matrix.platform != 'JS' }}
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
- name: Run Scala 2.[12|13] tests
if: ${{ startsWith(matrix.scala, '2.12.') || startsWith(matrix.scala, '2.13.') }}
- name: Run Scala 2 tests
if: ${{ startsWith(matrix.scala, '2.') }}
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
- name: Run Scala 3 tests
if: ${{ startsWith(matrix.scala, '3.2.') && matrix.platform == 'JVM' }}
if: ${{ startsWith(matrix.scala, '3.') && matrix.platform == 'JVM' }}
run: sbt ++${{ matrix.scala }}! testJVM

ci:
Expand Down
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import BuildHelper._

Global / onChangedBuildSource := ReloadOnSourceChanges

inThisBuild(
List(
organization := "dev.zio",
Expand Down Expand Up @@ -37,7 +39,7 @@ addCommandAlias(
";zioCacheNative/test:compile"
)

val zioVersion = "2.0.5"
val zioVersion = "2.0.6"

lazy val root = project
.in(file("."))
Expand Down
8 changes: 3 additions & 5 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,7 @@ object BuildHelper {
}
)

def jsSettings = Seq(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.5.0",
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
)
def jsSettings = Seq()

def nativeSettings = Seq(
Test / test := (Test / compile).value,
Expand All @@ -316,7 +313,8 @@ object BuildHelper {
def welcomeMessage = onLoadMessage := {
def header(text: String): String = s"${scala.Console.RED}$text${scala.Console.RESET}"

def item(text: String): String = s"${scala.Console.GREEN}> ${scala.Console.CYAN}$text${scala.Console.RESET}"
def item(text: String): String = s"${scala.Console.GREEN}> ${scala.Console.CYAN}$text${scala.Console.RESET}"

def subItem(text: String): String = s" ${scala.Console.YELLOW}> ${scala.Console.CYAN}$text${scala.Console.RESET}"

s"""|${header(" ________ ___")}
Expand Down

0 comments on commit 960d3f4

Please sign in to comment.