Skip to content

Commit 7f8ae74

Browse files
authored
Merge pull request #135 from typelevel/scala-3.0.0-RC2
Out with 3.0.0-M3, in with Scala 3.0.0-RC2
2 parents 9489fde + 34c8231 commit 7f8ae74

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest]
29-
scala: [2.12.13, 2.13.5, 3.0.0-M3, 3.0.0-RC1]
29+
scala: [2.12.13, 2.13.5, 3.0.0-RC1, 3.0.0-RC2]
3030
java: [adopt@1.8]
3131
runs-on: ${{ matrix.os }}
3232
steps:
@@ -131,22 +131,22 @@ jobs:
131131
tar xf targets.tar
132132
rm targets.tar
133133
134-
- name: Download target directories (3.0.0-M3)
134+
- name: Download target directories (3.0.0-RC1)
135135
uses: actions/download-artifact@v2
136136
with:
137-
name: target-${{ matrix.os }}-3.0.0-M3-${{ matrix.java }}
137+
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}
138138

139-
- name: Inflate target directories (3.0.0-M3)
139+
- name: Inflate target directories (3.0.0-RC1)
140140
run: |
141141
tar xf targets.tar
142142
rm targets.tar
143143
144-
- name: Download target directories (3.0.0-RC1)
144+
- name: Download target directories (3.0.0-RC2)
145145
uses: actions/download-artifact@v2
146146
with:
147-
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}
147+
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
148148

149-
- name: Inflate target directories (3.0.0-RC1)
149+
- name: Inflate target directories (3.0.0-RC2)
150150
run: |
151151
tar xf targets.tar
152152
rm targets.tar

build.sbt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}
22
import sbt.ForkOptions
33
import sbt.Tests._
44

5-
val catsV = "2.4.2"
6-
val disciplineSpecs2V = "1.1.4"
5+
val catsV = "2.5.0"
76
val scalacheckV = "1.15.3"
8-
val disciplineMunitV = "1.0.6"
7+
val disciplineMunitV = "1.0.7"
98

109
enablePlugins(SonatypeCiReleasePlugin)
1110

@@ -43,7 +42,7 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform)
4342
)
4443
)
4544
.jsSettings(
46-
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.1"
45+
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.2"
4746
)
4847
.dependsOn(core)
4948

@@ -136,11 +135,11 @@ inThisBuild(List(
136135
publishFullName := "Ross A. Baker",
137136
baseVersion := "0.4",
138137

139-
crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-M3", "3.0.0-RC1"),
138+
crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-RC1", "3.0.0-RC2"),
140139
scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last,
141140
versionIntroduced := Map(
142-
"3.0.0-M3" -> "1.0.0",
143-
"3.0.0-RC1" -> "1.0.0"
141+
"3.0.0-RC1" -> "1.0.0",
142+
"3.0.0-RC2" -> "1.0.1"
144143
),
145144

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

0 commit comments

Comments
 (0)