Merge pull request #72 from dotty-staging/dotty-community-build

Bump Scala 3 to M2

Author: anatoliykmetyuk

build.sc

@@ -4,7 +4,7 @@ import scalalib._
 
 val dottyVersion = Option(sys.props("dottyVersion"))
 
-object requests extends Cross[RequestsModule]((List("2.12.6", "2.13.0", "0.27.0-RC1") ++ dottyVersion): _*)
+object requests extends Cross[RequestsModule]((List("2.12.6", "2.13.0", "3.0.0-M2") ++ dottyVersion): _*)
 class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule with PublishModule {
   def publishVersion = "0.6.5"
   def artifactName = "requests"
@@ -23,8 +23,8 @@ class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule wit
   )
   object test extends Tests{
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.4",
-      ivy"com.lihaoyi::ujson::1.2.0"
+      ivy"com.lihaoyi::utest::0.7.5",
+      ivy"com.lihaoyi::ujson::1.2.2"
     )
     def testFrameworks = Seq("utest.runner.Framework")
   }

mill

@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.8.0
+DEFAULT_MILL_VERSION=0.8.0-13-105f53
 
 set -e
 

requests/test/src/requests/RequestTests.scala

@@ -61,7 +61,7 @@ object RequestTests extends TestSuite{
         for(chunkedUpload <- Seq(true, false)) {
           val res1 = requests.post(
             "https://httpbin.org/post",
-            data = Map("hello" -> "world", "foo" -> "baz"),
+            data = new RequestBlob.FormEncodedRequestBlob(Map("hello" -> "world", "foo" -> "baz")),
             chunkedUpload = chunkedUpload
           ).text()
           assert(read(res1).obj("form") == Obj("foo" -> "baz", "hello" -> "world"))
@@ -71,7 +71,7 @@ object RequestTests extends TestSuite{
         for (chunkedUpload <- Seq(true, false)) {
           val res1 = requests.put(
             "https://httpbin.org/put",
-            data = Map("hello" -> "world", "foo" -> "baz"),
+            data = new RequestBlob.FormEncodedRequestBlob(Map("hello" -> "world", "foo" -> "baz")),
             chunkedUpload = chunkedUpload
           ).text()
           assert(read(res1).obj("form") == Obj("foo" -> "baz", "hello" -> "world"))
@@ -189,21 +189,21 @@ object RequestTests extends TestSuite{
       val res1 = requests.post(
         "https://httpbin.org/post",
         compress = requests.Compress.None,
-        data = "Hello World"
+        data = new RequestBlob.ByteSourceRequestBlob("Hello World")
       )
       assert(res1.text().contains(""""Hello World""""))
 
       val res2 = requests.post(
         "https://httpbin.org/post",
         compress = requests.Compress.Gzip,
-        data = "I am cow"
+        data = new RequestBlob.ByteSourceRequestBlob("I am cow")
       )
       assert(res2.text().contains("data:application/octet-stream;base64,H4sIAAAAAAAAAA=="))
 
       val res3 = requests.post(
         "https://httpbin.org/post",
         compress = requests.Compress.Deflate,
-        data = "Hear me moo"
+        data = new RequestBlob.ByteSourceRequestBlob("Hear me moo")
       )
       assert(res3.text().contains("data:application/octet-stream;base64,eJw="))
       res3.text()
@@ -229,7 +229,7 @@ object RequestTests extends TestSuite{
       test("passwordProtected"){
         val res = requests.get(
           url,
-          cert = (s"$base/badssl.com-client.p12", "badssl.com"),
+          cert = Cert.implicitP12(s"$base/badssl.com-client.p12", "badssl.com"),
           check = false
         )
         if (res.statusCode == 400)
@@ -240,7 +240,7 @@ object RequestTests extends TestSuite{
       test("noPassword"){
         val res = requests.get(
           "https://client.badssl.com",
-          cert = s"$base/badssl.com-client-nopass.p12",
+          cert = Cert.implicitP12(s"$base/badssl.com-client-nopass.p12"),
           check = false
         )
         if (res.statusCode == 400)