Merge pull request #371 from danicheg/native

Add support for Scala Native

Author: danicheg

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [2.12.17, 3.2.0, 2.13.9]
         java: [temurin@8, temurin@17]
         exclude:
@@ -106,11 +106,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p target js/target jvm/target site/target project/target
+        run: mkdir -p js/target target site/target jvm/target native/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar target js/target jvm/target site/target project/target
+        run: tar cf targets.tar js/target target site/target jvm/target native/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -125,7 +125,7 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [2.13.9]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}

.jvmopts

@@ -0,0 +1,3 @@
+-Xms1G
+-Xmx4G
+-XX:+UseG1GC

build.sbt

@@ -4,30 +4,31 @@ val Scala3 = "3.2.0"
 
 ThisBuild / organization := "org.typelevel"
 ThisBuild / organizationName := "Typelevel"
-ThisBuild / tlBaseVersion := "1.1"
+ThisBuild / tlBaseVersion := "1.2"
 ThisBuild / scalaVersion := Scala213
 ThisBuild / crossScalaVersions := Seq(Scala212, Scala3, Scala213)
 ThisBuild / tlVersionIntroduced := Map("3" -> "1.0.3")
 ThisBuild / tlCiReleaseBranches := Seq("main")
 ThisBuild / tlSiteApiUrl := Some(url("https://www.javadoc.io/doc/org.typelevel/mouse_2.13/latest"))
+ThisBuild / githubWorkflowOSes := Seq("ubuntu-22.04")
 
 lazy val root = project
   .in(file("."))
   .settings(
     name := "mouse",
     licenses := List(License.MIT)
   )
-  .aggregate(js, jvm)
+  .aggregate(js, jvm, native)
   .enablePlugins(NoPublishPlugin)
 
-lazy val cross = crossProject(JSPlatform, JVMPlatform)
+lazy val cross = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("."))
   .settings(
     name := "mouse",
     libraryDependencies ++= Seq(
       "org.typelevel" %%% "cats-core" % "2.8.0",
-      "org.scalameta" %%% "munit" % "0.7.29" % Test,
-      "org.scalameta" %%% "munit-scalacheck" % "0.7.29" % Test
+      "org.scalameta" %%% "munit" % "1.0.0-M6" % Test,
+      "org.scalameta" %%% "munit-scalacheck" % "1.0.0-M6" % Test
     ),
     ThisBuild / licenses := List("MIT license" -> url("http://opensource.org/licenses/MIT")),
     developers := List(
@@ -50,6 +51,9 @@ lazy val cross = crossProject(JSPlatform, JVMPlatform)
   .jsSettings(
     tlVersionIntroduced := Map("3" -> "1.0.13")
   )
+  .nativeSettings(
+    tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.2.0").toMap
+  )
 
 lazy val docs = project
   .in(file("site"))
@@ -63,6 +67,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq(JDK8, JDK17)
 
 lazy val jvm = cross.jvm
 lazy val js = cross.js
+lazy val native = cross.native
 
 // Scalafmt
 addCommandAlias("fmt", "; Compile / scalafmt; Test / scalafmt; scalafmtSbt")

native/src/main/scala-2/mouse/mouse.scala

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Typelevel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package object mouse extends MouseFunctions {
+  object all extends AllSharedSyntax
+  object any extends AnySyntax
+  object anyf extends AnyFSyntax
+  object boolean extends BooleanSyntax
+  object double extends DoubleSyntax
+  object fboolean extends FBooleanSyntax
+  object feither extends FEitherSyntax
+  object fnested extends FNestedSyntax
+  object foption extends FOptionSyntax
+  object ftuple extends FTupleSyntax
+  object int extends IntSyntax
+  object list extends ListSyntax
+  object long extends LongSyntax
+  object map extends MapSyntax
+  object option extends OptionSyntax
+  object set extends SetSyntax
+  object string extends StringSyntax
+  object `try` extends TrySyntax
+  object tuple extends TupleSyntax
+}

native/src/main/scala-3/mouse/package.scala

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Typelevel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package object mouse extends MouseFunctions {
+  object all extends AllSharedSyntax
+  object any extends AnySyntax
+  object anyf extends AnyFSyntax
+  object boolean extends BooleanSyntax
+  object double extends DoubleSyntax
+  object fboolean extends FBooleanSyntax
+  object feither extends FEitherSyntax
+  object fnested extends FNestedSyntax
+  object foption extends FOptionSyntax
+  object ftuple extends FTupleSyntax
+  object int extends IntSyntax
+  object list extends ListSyntax
+  object long extends LongSyntax
+  object map extends MapSyntax
+  object option extends OptionSyntax
+  object set extends SetSyntax
+  object string extends StringSyntax
+  object `try` extends TrySyntax
+}

project/plugins.sbt

@@ -1,4 +1,6 @@
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.15")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.15")

shared/src/test/scala/mouse/StringSyntaxTests.scala

@@ -29,7 +29,9 @@ import org.scalacheck.{Arbitrary, Gen}
 class StringSyntaxTests extends MouseSuite {
   test("StringOps.parseInt") {
     assertEquals("123".parseInt, 123.asRight[NumberFormatException])
-    assertEquals("blah".parseInt.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseInt.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseInt") {
@@ -48,7 +50,9 @@ class StringSyntaxTests extends MouseSuite {
 
   test("StringOps.parseLong") {
     assertEquals("123".parseLong, 123L.asRight[NumberFormatException])
-    assertEquals("blah".parseLong.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseLong.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseLong") {
@@ -67,7 +71,9 @@ class StringSyntaxTests extends MouseSuite {
 
   test("StringOps.parseShort") {
     assertEquals("123".parseShort, 123.toShort.asRight[NumberFormatException])
-    assertEquals("blah".parseShort.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseShort.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseShort") {
@@ -86,7 +92,9 @@ class StringSyntaxTests extends MouseSuite {
 
   test("StringOps.parseDouble") {
     assertEquals("123.1".parseDouble, 123.1.asRight[NumberFormatException])
-    assertEquals("blah".parseDouble.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseDouble.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseDouble") {
@@ -104,7 +112,9 @@ class StringSyntaxTests extends MouseSuite {
   }
 
   test("StringOps.parseFloat") {
-    assertEquals("blah".parseFloat.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseFloat.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseFloat") {
@@ -123,7 +133,9 @@ class StringSyntaxTests extends MouseSuite {
 
   test("StringOps.parseByte") {
     assertEquals("123".parseByte, 123.toByte.asRight[NumberFormatException])
-    assertEquals("blah".parseByte.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseByte.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseByte") {
@@ -142,7 +154,9 @@ class StringSyntaxTests extends MouseSuite {
 
   test("StringOps.parseBigInt") {
     assertEquals("123".parseBigInt, BigInt("123").asRight[NumberFormatException])
-    assertEquals("blah".parseBigInt.leftMap(_.getMessage), "For input string: \"blah\"".asLeft)
+    assertEquals("blah".parseBigInt.leftMap(_.getMessage.replace("string ", "string: ")),
+                 "For input string: \"blah\"".asLeft
+    )
   }
 
   property("scalacheck-suite: StringOps.parseBigInt") {
@@ -196,7 +210,9 @@ class StringSyntaxTests extends MouseSuite {
       Arbitrary.arbString.arbitrary.filter(s => !s.equalsIgnoreCase("true") && !s.equalsIgnoreCase("false"))
 
     forAll(stringGen) { (s: String) =>
-      assertEquals(s.parseBoolean.leftMap(_.getMessage), ("For input string: \"" + s + "\"").asLeft)
+      assertEquals(s.parseBoolean.leftMap(_.getMessage.replace("string ", "string: ")),
+                   ("For input string: \"" + s + "\"").asLeft
+      )
     }
   }