Skip to content

Scala 3 #44

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.

Sign up for GitHub

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

Open
keynmol wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Scala 3 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90f8a5c
Add Scala 3 to the build
keynmol Mar 13, 2022
8d916c0
Fix Scala.js build
keynmol Mar 13, 2022
c531070
Reenable tests on Scala 3 Native
keynmol May 4, 2022
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
29 changes: 20 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
val Leaf = "0.1.0"
val Scala2_11 = "2.11.12"
val Scala2_12 = "2.12.13"
val Scala2_13 = "2.13.4"
val ScalaTest = "3.2.4-M1"
val Scala2_12 = "2.12.15"
val Scala2_13 = "2.13.8"
val Scala3 = "3.1.1"
val ScalaTest = "3.2.12"

val SharedSettings = Seq(
name := "trail",
organization := "tech.sparse",

scalaVersion := Scala2_13,
crossScalaVersions := Seq(Scala2_13, Scala2_12, Scala2_11),
scalacOptions := Seq(
"-unchecked",
"-deprecation",
"-encoding", "utf8"
),
crossScalaVersions := Seq(Scala3, Scala2_13, Scala2_12, Scala2_11),
scalacOptions := {
// Preserve -scalajs flag used by Scala.js on Scala 3
scalacOptions.value.filter(_ == "-scalajs") ++
Seq(
"-unchecked",
"-deprecation",
"-encoding", "utf8"
)
},

pomExtra :=
<url>https://github.com/sparsetech/trail</url>
Expand Down Expand Up @@ -60,3 +65,9 @@ lazy val manual = project.in(file("manual"))
publishArtifact := false,
libraryDependencies += "tech.sparse" %% "leaf-notebook" % Leaf
)

def isScala3(ver: String) =
CrossVersion.partialVersion(ver) match {
case Some((3, _)) => true
case _ => false
}
5 changes: 3 additions & 2 deletions native/src/main/scala/trail/URI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object URI {
if (c == '+') result.append(' ')
else if (c == '%') {
out.reset()
do {
while({
if (i + 2 >= s.length)
throw new IllegalArgumentException("Incomplete % sequence at: " + i)
val d1 = Character.digit(s.charAt(i + 1), 16)
Expand All @@ -35,7 +35,8 @@ object URI {
s"Invalid % sequence (${s.substring(i, i + 3)}) at: ${String.valueOf(i)}.")
out.write(((d1 << 4) + d2).toByte)
i += 3
} while (i < s.length && s.charAt(i) == '%')
(i < s.length && s.charAt(i) == '%')
}) { }
result.append(out.toString("UTF-8"))
} else {
result.append(c)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.6
sbt.version=1.6.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ logLevel := Level.Warn

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
12 changes: 10 additions & 2 deletions shared/src/main/scala/trail/PathElement.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package trail

case class Arg[T]()(implicit val codec: Codec[T]) {
class Arg[T]()(implicit val codec: Codec[T]) {
Copy link
Copy Markdown
Author

@keynmol keynmol Mar 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issues like

[error] 134 |        val bar = !# / "asdf" / Arg[Int] / Arg[Boolean]
[error]     |                                           ^^^^^^^^^^^^
[error]     |            method apply in object Arg must be called with () argument

override def equals(o: Any): Boolean =
o match {
case a: Arg[T] => a.codec.equals(codec)
Expand All @@ -10,6 +10,10 @@ case class Arg[T]()(implicit val codec: Codec[T]) {
override def hashCode(): Int = ("trail.Arg", codec).hashCode()
}

object Arg {
def apply[T](implicit codec: Codec[T]) = new Arg()
}

case class Param[T](name: String)(implicit val codec: Codec[T]) {
override def equals(o: Any): Boolean =
o match {
Expand All @@ -20,7 +24,7 @@ case class Param[T](name: String)(implicit val codec: Codec[T]) {
override def hashCode(): Int = ("trail.Param", name, codec).hashCode()
}

case class Fragment[T]()(implicit val codec: Codec[T]) {
class Fragment[T](implicit val codec: Codec[T]) {
override def equals(o: Any): Boolean =
o match {
case f: Fragment[T] => f.codec.equals(codec)
Expand All @@ -29,3 +33,7 @@ case class Fragment[T]()(implicit val codec: Codec[T]) {

override def hashCode(): Int = ("trail.Fragment", codec).hashCode()
}

object Fragment {
def apply[T](implicit codec: Codec[T]) = new Fragment[T]
}