publish cask 0.8.1 for Scala 2.12

com-lihaoyi · Apr 27, 2022 · 0fe5244 · 0fe5244
1 parent d275371
commit 0fe5244
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/build.sc b/build.sc
@@ -29,6 +29,7 @@ import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
 import de.tobiasroeser.mill.vcs.version.VcsVersion
 
 val scala213 = "2.13.5"
+val scala212 = "2.12.14"
 val scala3 = "3.0.0"
 val dottyCustomVersion = Option(sys.props("dottyVersion"))
 
@@ -71,7 +72,7 @@ class CaskMainModule(val crossScalaVersion: String) extends CaskModule {
   def moduleDeps = Seq(cask.util.jvm(crossScalaVersion))
   def artifactName = "cask"
 }
-object cask extends Cross[CaskMainModule]((Seq(scala213, scala3) ++ dottyCustomVersion): _*) {
+object cask extends Cross[CaskMainModule]((Seq(scala212, scala213, scala3) ++ dottyCustomVersion): _*) {
   object util extends Module {
     trait UtilModule extends CaskModule {
       def artifactName = "cask-util"
@@ -95,7 +96,7 @@ object cask extends Cross[CaskMainModule]((Seq(scala213, scala3) ++ dottyCustomV
         ivy"org.java-websocket:Java-WebSocket:1.5.0"
       )
     }
-    object jvm extends Cross[UtilJvmModule]((Seq(scala213, scala3) ++ dottyCustomVersion): _*)
+    object jvm extends Cross[UtilJvmModule]((Seq(scala212, scala213, scala3) ++ dottyCustomVersion): _*)
 
     class UtilJsModule(val crossScalaVersion: String) extends UtilModule with ScalaJSModule {
       def platformSegment = "js"
@@ -116,7 +117,7 @@ object example extends Module{
     def moduleDeps = Seq(cask(crossScalaVersion))
   }
 
-  val allVersions = Seq(scala213, scala3) ++ dottyCustomVersion
+  val allVersions = Seq(scala212, scala213, scala3) ++ dottyCustomVersion
 
   class CompressModule(val crossScalaVersion: String) extends $file.example.compress.build.AppModule with LocalModule
   object compress extends Cross[CompressModule](allVersions: _*)
@@ -156,7 +157,7 @@ object example extends Module{
 
   // java.lang.NoSuchMethodError: 'void geny.Writable.$init$(geny.Writable)' - geny mismatch, need to upgrade
   class ScalatagsModule(val crossScalaVersion: String) extends $file.example.scalatags.build.AppModule with LocalModule
-  object scalatags extends Cross[ScalatagsModule](scala213)
+  object scalatags extends Cross[ScalatagsModule](scala212, scala213)
 
   class StaticFilesModule(val crossScalaVersion: String) extends $file.example.staticFiles.build.AppModule with LocalModule
   object staticFiles extends Cross[StaticFilesModule](allVersions: _*)
@@ -165,13 +166,13 @@ object example extends Module{
   object staticFiles2 extends Cross[StaticFiles2Module](allVersions: _*)
 
   class TodoModule(val crossScalaVersion: String) extends $file.example.todo.build.AppModule with LocalModule
-  object todo extends Cross[TodoModule](scala213) // uses quill, can't enable for Dotty yet
+  object todo extends Cross[TodoModule](scala212, scala213) // uses quill, can't enable for Dotty yet
 
   class TodoApiModule(val crossScalaVersion: String) extends $file.example.todoApi.build.AppModule with LocalModule
   object todoApi extends Cross[TodoApiModule](allVersions: _*)
 
   class TodoDbModule(val crossScalaVersion: String) extends $file.example.todoDb.build.AppModule with LocalModule
-  object todoDb extends Cross[TodoDbModule](scala213) // uses quill, can't enable for Dotty yet
+  object todoDb extends Cross[TodoDbModule](scala212, scala213) // uses quill, can't enable for Dotty yet
 
   class TwirlModule(val crossScalaVersion: String) extends $file.example.twirl.build.AppModule with LocalModule
   object twirl extends Cross[TwirlModule](allVersions: _*)

diff --git a/cask/src/cask/main/Main.scala b/cask/src/cask/main/Main.scala
@@ -148,7 +148,8 @@ object Main{
       metadata <- routes.caskMetadata.value
     } yield {
       val segments = Util.splitPath(metadata.endpoint.path)
-      val methodMap = metadata.endpoint.methods.map(_ -> (routes, metadata: EndpointMetadata[_])).toMap
+      val methods = metadata.endpoint.methods.map(_ -> (routes, metadata: EndpointMetadata[_]))
+      val methodMap = methods.toMap[String, (Routes, EndpointMetadata[_])]
       (segments, methodMap, metadata.endpoint.subpath)
     }
 

diff --git a/example/formJsonPost/app/test/src/ExampleTests.scala b/example/formJsonPost/app/test/src/ExampleTests.scala
@@ -19,7 +19,10 @@ object ExampleTests extends TestSuite{
   val tests = Tests{
     test("FormJsonPost") - withServer(FormJsonPost){ host =>
       val response1 = requests.post(s"$host/json", data = """{"value1": true, "value2": [3]}""")
-      ujson.read(response1.text()) ==> ujson.Str("OK true List(3)")
+      assert(
+        ujson.read(response1.text()) == ujson.Str("OK true List(3)") ||
+        ujson.read(response1.text()) == ujson.Str("OK true Vector(3)")
+      )
 
       val response2 = requests.post(
         s"$host/json-obj",
@@ -31,7 +34,10 @@ object ExampleTests extends TestSuite{
         s"$host/form",
         data = Seq("value1" -> "hello", "value2" -> "1", "value2" -> "2")
       )
-      response3.text() ==> "OK FormValue(hello,null) List(1, 2)"
+      assert(
+        response3.text() == "OK FormValue(hello,null) List(1, 2)" ||
+        response3.text() == "OK FormValue(hello,null) Vector(1, 2)"
+      )
 
       val response4 = requests.post(
         s"$host/form-obj",

diff --git a/example/variableRoutes/app/test/src/ExampleTests.scala b/example/variableRoutes/app/test/src/ExampleTests.scala
@@ -26,8 +26,12 @@ object ExampleTests extends TestSuite{
       requests.get(s"$host/user", check = false).statusCode ==> 404
 
 
-      requests.get(s"$host/post/123?param=xyz&param=abc").text() ==>
-        "Post 123 ArraySeq(xyz, abc)"
+      assert(
+        requests.get(s"$host/post/123?param=xyz&param=abc").text() ==
+          "Post 123 ArraySeq(xyz, abc)" ||
+        requests.get(s"$host/post/123?param=xyz&param=abc").text() ==
+          "Post 123 ArrayBuffer(xyz, abc)"
+      )
 
       requests.get(s"$host/post/123", check = false).text() ==>
         """Missing argument: (param: Seq[String])

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-Cask 0.8.0: a Scala HTTP micro-framework [![Build Status][travis-badge]][travis-link] [![Gitter Chat][gitter-badge]][gitter-link] [![Patreon][patreon-badge]][patreon-link]
+Cask 0.8.1: a Scala HTTP micro-framework [![Build Status][travis-badge]][travis-link] [![Gitter Chat][gitter-badge]][gitter-link] [![Patreon][patreon-badge]][patreon-link]
 ===========================================================================================================================================================================
 
 [travis-badge]: https://travis-ci.org/lihaoyi/cask.svg
@@ -46,6 +46,10 @@ courtesy of EJ Technologies
 
 ## Changelog
 
+### 0.8.1
+
+- Publish Cask for Scala 2.12 again
+
 ### 0.8.0
 
 - Improve handling on 404/405 responses with unsupported methods