Upgrade to Scala 3.0.0

com-lihaoyi · May 15, 2021 · 7705c2b · 7705c2b
1 parent 329b520
commit 7705c2b
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 56 deletions.
diff --git a/build.sc b/build.sc
@@ -27,7 +27,7 @@ import $file.example.websockets3.build
 import $file.example.websockets4.build
 
 val scala213 = "2.13.5"
-val scala3 = "3.0.0-RC3"
+val scala3 = "3.0.0"
 val dottyCustomVersion = Option(sys.props("dottyVersion"))
 
 trait CaskModule extends CrossScalaModule with PublishModule{
@@ -51,7 +51,7 @@ class CaskMainModule(val crossScalaVersion: String) extends CaskModule {
   def ivyDeps = T{
     Agg(
       ivy"io.undertow:undertow-core:2.2.3.Final",
-      ivy"com.lihaoyi::upickle:1.3.12"
+      ivy"com.lihaoyi::upickle:1.3.13"
     ) ++
     (if(!isDotty) Agg(ivy"org.scala-lang:scala-reflect:${scalaVersion()}") else Agg())
   }
@@ -62,8 +62,8 @@ class CaskMainModule(val crossScalaVersion: String) extends CaskModule {
   object test extends Tests{
     def testFrameworks = Seq("utest.runner.Framework")
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8"
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9"
     )
   }
   def moduleDeps = Seq(cask.util.jvm(crossScalaVersion))
@@ -81,9 +81,9 @@ object cask extends Cross[CaskMainModule]((Seq(scala213, scala3) ++ dottyCustomV
         millSourcePath / s"src-$platformSegment"
       )
       def ivyDeps = Agg(
-        ivy"com.lihaoyi::sourcecode:0.2.6",
-        ivy"com.lihaoyi::pprint:0.6.5",
-        ivy"com.lihaoyi::geny:0.6.9"
+        ivy"com.lihaoyi::sourcecode:0.2.7",
+        ivy"com.lihaoyi::pprint:0.6.6",
+        ivy"com.lihaoyi::geny:0.6.10"
       )
     }
     class UtilJvmModule(val crossScalaVersion: String) extends UtilModule {

diff --git a/example/compress/build.sc b/example/compress/build.sc
@@ -10,8 +10,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/compress2/build.sc b/example/compress2/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/compress3/build.sc b/example/compress3/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/cookies/build.sc b/example/cookies/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/decorated/build.sc b/example/decorated/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/decorated2/build.sc b/example/decorated2/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/endpoints/build.sc b/example/endpoints/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/formJsonPost/build.sc b/example/formJsonPost/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8"
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9"
     )
   }
 }
diff --git a/example/httpMethods/build.sc b/example/httpMethods/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/minimalApplication/build.sc b/example/minimalApplication/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/minimalApplication2/build.sc b/example/minimalApplication2/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/redirectAbort/build.sc b/example/redirectAbort/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/scalatags/build.sc b/example/scalatags/build.sc
@@ -11,8 +11,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/staticFiles/build.sc b/example/staticFiles/build.sc
@@ -11,8 +11,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
 
     def forkWorkingDir = build.millSourcePath

diff --git a/example/staticFiles2/build.sc b/example/staticFiles2/build.sc
@@ -11,8 +11,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
 
     def forkWorkingDir = build.millSourcePath

diff --git a/example/todo/build.sc b/example/todo/build.sc
@@ -13,8 +13,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/todoApi/build.sc b/example/todoApi/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc
@@ -12,8 +12,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/twirl/build.sc b/example/twirl/build.sc
@@ -15,8 +15,8 @@ trait AppModule extends CrossScalaModule with mill.twirllib.TwirlModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/variableRoutes/build.sc b/example/variableRoutes/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 }
diff --git a/example/websockets/build.sc b/example/websockets/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/example/websockets2/build.sc b/example/websockets2/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/example/websockets3/build.sc b/example/websockets3/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/example/websockets4/build.sc b/example/websockets4/build.sc
@@ -9,8 +9,8 @@ trait AppModule extends CrossScalaModule{
     def testFrameworks = Seq("utest.runner.Framework")
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.9",
-      ivy"com.lihaoyi::requests::0.6.8",
+      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::requests::0.6.9",
       ivy"org.asynchttpclient:async-http-client:2.5.2"
     )
   }

diff --git a/mill b/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.9.5-48-4ad87f
+DEFAULT_MILL_VERSION=0.9.7
 
 
 set -e