Skip to content

Update scala 3 #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ The implementation is based on the original BSD-licensed reference implementatio
#### Usage

The *scala-java-time* library is currently available for Scala (JVM, version 8 and later) and Scala.js (JavaScript).
Scala 2.11, Scala 2.12, Scala 2.13 and Scala 3.0.0-RC1/RC2 are supported.
Scala 2.11, Scala 2.12, Scala 2.13 and Scala 3.0.0-RC2/RC3 are supported.

To get started with SBT, add one (or both) of these dependencies:

- `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.2.1"`
- `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.2.2"`

#### Documentation

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject }
import sbt._
import sbt.io.Using

val scalaVer = "3.0.0-RC2"
val scalaVer = "3.0.0-RC3"
val tzdbVersion = "2019c"
val scalajavaLocalesVersion = "1.1.2"
val scalajavaLocalesVersion = "1.1.3"
Global / onChangedBuildSource := ReloadOnSourceChanges

Global / resolvers += Resolver.sonatypeRepo("public")
Expand Down Expand Up @@ -53,7 +53,7 @@ def scalaVersionSpecificFolders(srcName: String, srcBaseDir: java.io.File, scala
lazy val commonSettings = Seq(
description := "java.time API implementation in Scala and Scala.js",
scalaVersion := scalaVer,
crossScalaVersions := Seq("2.11.12", "2.12.13", "2.13.5", "3.0.0-RC1", "3.0.0-RC2"),
crossScalaVersions := Seq("2.11.12", "2.12.13", "2.13.5", "3.0.0-RC2", "3.0.0-RC3"),
// Don't include threeten on the binaries
Compile / packageBin / mappings := (Compile / packageBin / mappings).value.filter {
case (f, s) => !s.contains("threeten")
Expand Down