Skip to content

Commit 960d3f4

Browse files
authored
Fix publishing: remove dependency on "io.github.cquiroz" %%% "scala-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
1 parent c07a615 commit 960d3f4

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

.github/workflows/ci.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,11 @@ jobs:
7171
check-latest: true
7272
- name: Cache scala dependencies
7373
uses: coursier/cache-action@v6
74-
- name: Run Scala 2.11
75-
if: ${{ startsWith(matrix.scala, '2.11.') && matrix.platform != 'JS' }}
76-
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
77-
- name: Run Scala 2.[12|13] tests
78-
if: ${{ startsWith(matrix.scala, '2.12.') || startsWith(matrix.scala, '2.13.') }}
74+
- name: Run Scala 2 tests
75+
if: ${{ startsWith(matrix.scala, '2.') }}
7976
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
8077
- name: Run Scala 3 tests
81-
if: ${{ startsWith(matrix.scala, '3.2.') && matrix.platform == 'JVM' }}
78+
if: ${{ startsWith(matrix.scala, '3.') && matrix.platform == 'JVM' }}
8279
run: sbt ++${{ matrix.scala }}! testJVM
8380

8481
ci:

build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import BuildHelper._
22

3+
Global / onChangedBuildSource := ReloadOnSourceChanges
4+
35
inThisBuild(
46
List(
57
organization := "dev.zio",
@@ -37,7 +39,7 @@ addCommandAlias(
3739
";zioCacheNative/test:compile"
3840
)
3941

40-
val zioVersion = "2.0.5"
42+
val zioVersion = "2.0.6"
4143

4244
lazy val root = project
4345
.in(file("."))

project/BuildHelper.scala

+3-5
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,7 @@ object BuildHelper {
293293
}
294294
)
295295

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

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

319-
def item(text: String): String = s"${scala.Console.GREEN}> ${scala.Console.CYAN}$text${scala.Console.RESET}"
316+
def item(text: String): String = s"${scala.Console.GREEN}> ${scala.Console.CYAN}$text${scala.Console.RESET}"
317+
320318
def subItem(text: String): String = s" ${scala.Console.YELLOW}> ${scala.Console.CYAN}$text${scala.Console.RESET}"
321319

322320
s"""|${header(" ________ ___")}

0 commit comments

Comments
 (0)