Skip to content

Commit 93610f4

Browse files
committed
Version bump to allow for Scala native release on scala 3
1 parent 7f2fb16 commit 93610f4

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
38-
scala: [2.12.15, 2.13.7, 3.1.0]
38+
scala: [2.12.15, 2.13.8, 3.1.2]
3939
experimental: [false]
4040

4141
steps:
@@ -91,7 +91,7 @@ jobs:
9191
fail-fast: false
9292
matrix:
9393
node: [14, 16]
94-
scala: [2.12.15, 2.13.7, 3.1.0]
94+
scala: [2.12.15, 2.13.8, 3.1.2]
9595

9696
steps:
9797
- name: Checkout repository
@@ -148,7 +148,7 @@ jobs:
148148
strategy:
149149
fail-fast: false
150150
matrix:
151-
scala: [2.12.15, 2.13.7]
151+
scala: [2.12.15, 2.13.8, 3.1.2]
152152

153153
steps:
154154
- name: Checkout repository
@@ -213,7 +213,7 @@ jobs:
213213
github.event_name == 'pull_request' && (needs.validate.result == 'success' || needs.validate.result == 'skipped'))
214214
215215
env:
216-
SCALA_VERSION: 2.13.7
216+
SCALA_VERSION: 2.13.8
217217

218218
steps:
219219
- name: Checkout repository

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ inThisBuild(List(
1919
))
2020

2121
val scala212Version = "2.12.15"
22-
val scala213Version = "2.13.7"
23-
val scala3Version = "3.1.0"
22+
val scala213Version = "2.13.8"
23+
val scala3Version = "3.1.2"
2424

2525
def usesLib213(major: Long, minor: Long): Boolean = major > 2 || minor >= 13
2626
def extraSources(rootSrcFile: File, base: String, major: Long, minor: Long): Seq[File] = {
@@ -37,7 +37,7 @@ def extraSources(rootSrcFile: File, base: String, version: String): Seq[File] =
3737

3838
def scalaTestDependency(version: String): String =
3939
Map()
40-
.getOrElse(version, "3.2.9")
40+
.getOrElse(version, "3.2.12")
4141

4242
val PureVisible: CrossType = new CrossType {
4343
def projectDir(crossBase: File, projectType: String): File =
@@ -91,7 +91,7 @@ lazy val parsley = crossProject(JSPlatform, JVMPlatform, NativePlatform)
9191
Test / scalaJSLinkerConfig := scalaJSLinkerConfig.value.withESFeatures(_.withESVersion(ESVersion.ES2018))
9292
)
9393
.nativeSettings(
94-
crossScalaVersions := List(scala212Version, scala213Version),
94+
crossScalaVersions := List(scala212Version, scala213Version, scala3Version),
9595
Compile / bloopGenerate := None,
9696
Test / bloopGenerate := None
9797
)

native/src/main/scala/parsley/io.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ object io {
4040
}
4141
} yield {
4242
src.close()
43-
new Context(p.internal.threadSafeInstrs, input, Some(file.getName)).runParser()
43+
new Context(con(p).internal.threadSafeInstrs, input, Some(file.getName)).runParser()
4444
}
4545
}
4646
}

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.0
1+
sbt.version=1.6.2

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
22
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
44
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
5-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1")
5+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
66
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
77
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8") // This is here purely to enable the niceness settings

0 commit comments

Comments
 (0)