Skip to content

Commit 7f20746

Browse files
authored
Merge pull request #143 from vasilmkd/scala3-rc3
Update to Scala 3.0.0-RC3
2 parents 1cfebc1 + c1ddad6 commit 7f20746

3 files changed

Lines changed: 15 additions & 13 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-RC1, 3.0.0-RC2]
29+
scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3]
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-RC1)
134+
- name: Download target directories (3.0.0-RC2)
135135
uses: actions/download-artifact@v2
136136
with:
137-
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}
137+
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
138138

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

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ target/
66
# Ignore [ce]tags files
77
tags
88

9+
.bsp
910
.bloop
1011
.metals
1112
/project/metals.sbt

build.sbt

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

5-
val catsV = "2.5.0"
5+
val catsV = "2.6.0"
66
val scalacheckV = "1.15.3"
7-
val disciplineMunitV = "1.0.7"
7+
val disciplineMunitV = "1.0.8"
88

99
enablePlugins(SonatypeCiReleasePlugin)
1010

@@ -42,7 +42,7 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform)
4242
)
4343
)
4444
.jsSettings(
45-
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.2"
45+
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.3"
4646
)
4747
.dependsOn(core)
4848

@@ -133,13 +133,14 @@ inThisBuild(List(
133133
organizationName := "Typelevel",
134134
publishGithubUser := "rossabaker",
135135
publishFullName := "Ross A. Baker",
136-
baseVersion := "0.4",
136+
baseVersion := "1.1",
137137

138-
crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-RC1", "3.0.0-RC2"),
138+
crossScalaVersions := Seq("2.12.13", Scala213, "3.0.0-RC2", "3.0.0-RC3"),
139139
scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last,
140140
versionIntroduced := Map(
141141
"3.0.0-RC1" -> "1.0.0",
142-
"3.0.0-RC2" -> "1.0.1"
142+
"3.0.0-RC2" -> "1.0.1",
143+
"3.0.0-RC3" -> "1.1.3"
143144
),
144145

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

0 commit comments

Comments
 (0)