Skip to content

Commit

Permalink
Merge pull request #143 from vasilmkd/scala3-rc3
Browse files Browse the repository at this point in the history
Update to Scala 3.0.0-RC3
  • Loading branch information
rossabaker authored Apr 24, 2021
2 parents 1cfebc1 + c1ddad6 commit 7f20746
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -131,22 +131,22 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC1)
- name: Download target directories (3.0.0-RC2)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC1)
- name: Inflate target directories (3.0.0-RC2)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC2)
- name: Download target directories (3.0.0-RC3)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC2)
- name: Inflate target directories (3.0.0-RC3)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ target/
# Ignore [ce]tags files
tags

.bsp
.bloop
.metals
/project/metals.sbt
13 changes: 7 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}
import sbt.ForkOptions
import sbt.Tests._

val catsV = "2.5.0"
val catsV = "2.6.0"
val scalacheckV = "1.15.3"
val disciplineMunitV = "1.0.7"
val disciplineMunitV = "1.0.8"

enablePlugins(SonatypeCiReleasePlugin)

Expand Down Expand Up @@ -42,7 +42,7 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform)
)
)
.jsSettings(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.2"
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.3"
)
.dependsOn(core)

Expand Down Expand Up @@ -133,13 +133,14 @@ inThisBuild(List(
organizationName := "Typelevel",
publishGithubUser := "rossabaker",
publishFullName := "Ross A. Baker",
baseVersion := "0.4",
baseVersion := "1.1",

crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-RC1", "3.0.0-RC2"),
crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-RC2", "3.0.0-RC3"),
scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last,
versionIntroduced := Map(
"3.0.0-RC1" -> "1.0.0",
"3.0.0-RC2" -> "1.0.1"
"3.0.0-RC2" -> "1.0.1",
"3.0.0-RC3" -> "1.1.3"
),

homepage := Some(url("https://github.com/typelevel/case-insensitive")),
Expand Down

0 comments on commit 7f20746

Please sign in to comment.