Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Update dependencies; Remove Scala 2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
987Nabil committed Aug 12, 2024
1 parent 2b8dbac commit 4126ea2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 30 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was autogenerated using `zio-sbt-ci` plugin via `sbt generateGithubWorkflow`
# This file was autogenerated using `zio-sbt-ci` plugin via `sbt generateGithubWorkflow`
# task and should be included in the git repository. Please do not edit it manually.

name: CI
Expand Down Expand Up @@ -62,21 +62,17 @@ jobs:
fail-fast: false
matrix:
java:
- '8'
- '11'
- '17'
- '21'
scala-project:
- ++2.11.12 zioOpticsJVM
- ++2.12.17 zioOpticsJVM
- ++2.13.10 zioOpticsJVM
- ++3.2.2 zioOpticsJVM
- ++2.11.12 zioOpticsNative
- ++2.12.17 zioOpticsNative
- ++2.13.10 zioOpticsNative
- ++3.2.2 zioOpticsNative
- ++2.11.12 zioOpticsJS
- ++2.12.17 zioOpticsJS
- ++2.13.10 zioOpticsJS
- ++2.12.19 zioOpticsJVM
- ++2.13.14 zioOpticsJVM
- ++3.3.3 zioOpticsJVM
- ++2.12.19 zioOpticsNative
- ++2.13.14 zioOpticsNative
- ++3.3.3 zioOpticsNative
- ++2.12.19 zioOpticsJS
- ++2.13.14 zioOpticsJS
steps:
- name: Setup Scala
uses: actions/setup-java@v3.10.0
Expand Down
16 changes: 6 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ inThisBuild(
url("https://github.com/adamgfraser")
)
),
supportedScalaVersions :=
Map(
(zioOptics.jvm / thisProject).value.id -> (zioOptics.jvm / crossScalaVersions).value,
(zioOptics.native / thisProject).value.id -> (zioOptics.native / crossScalaVersions).value,
(zioOptics.js / thisProject).value.id -> (zioOptics.js / crossScalaVersions).value.filterNot(_ == scala3.value)
)
scala213 := "2.13.14"
)
)

Expand All @@ -46,7 +41,7 @@ addCommandAlias(
";zioOpticsNative/test:compile"
)

val zioVersion = "2.0.10"
val zioVersion = "2.1.7"

lazy val root = project
.in(file("."))
Expand All @@ -63,10 +58,12 @@ lazy val root = project

lazy val zioOptics = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.in(file("zio-optics"))
.settings(stdSettings(name = "zio-optics", packageName = Some("zio.optics"), enableCrossProject = true))
.settings(stdSettings(name = Some("zio-optics"), packageName = Some("zio.optics"), enableCrossProject = true))
.settings(enableZIO())
.settings(
libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test
libraryDependencies += "dev.zio" %%% "zio" % zioVersion,
libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test,
libraryDependencies += "dev.zio" %%% "zio-test" % zioVersion % Test
)
.jvmSettings(scala3Settings)
.jvmSettings(scalaReflectTestSettings)
Expand All @@ -89,7 +86,6 @@ lazy val docs = project
moduleName := "zio-optics-docs",
scalacOptions -= "-Yno-imports",
scalacOptions -= "-Xfatal-warnings",
crossScalaVersions -= scala211.value,
projectName := (ThisBuild / name).value,
mainModuleName := (zioOptics.jvm / moduleName).value,
projectStage := ProjectStage.Development,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.8.2
sbt.version = 1.10.1
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val zioSbtVersion = "0.3.10+43-080b598b-SNAPSHOT"
val zioSbtVersion = "0.4.0-alpha.28"

addSbtPlugin(
"dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion exclude ("org.scala-js", "sbt-scalajs") exclude ("org.scala-native", "sbt-scala-native")
Expand All @@ -10,16 +10,16 @@ addSbtPlugin(
"dev.zio" % "zio-sbt-ci" % zioSbtVersion exclude ("org.scala-js", "sbt-scalajs") exclude ("org.scala-native", "sbt-scala-native")
)
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") // Still supports 2.11
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9") // Still supports 2.11
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")

resolvers ++= Resolver.sonatypeOssRepos("public")

import sbt.internal.librarymanagement.mavenint.PomExtraDependencyAttributes

ThisBuild / dependencyOverrides ++= List(
"org.scala-js" % "sbt-scalajs" % "1.12.0",
"org.scala-native" % "sbt-scala-native" % "0.4.9"
"org.scala-js" % "sbt-scalajs" % "1.16.0",
"org.scala-native" % "sbt-scala-native" % "0.5.4"
).map(
_.extra(
PomExtraDependencyAttributes.SbtVersionKey -> (update / scalaBinaryVersion).value,
Expand Down

0 comments on commit 4126ea2

Please sign in to comment.