Bump versions in preparation for 3.0.0 final (#1549)

com-lihaoyi · Sep 13, 2024 · e1ff675 · e1ff675
1 parent 486378a
commit e1ff675
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -22,21 +22,21 @@ jobs:
             command: 'terminal.__.test'
 
           - java-version: 11
-            command: 'sshd[{2.12.20,2.13.14,3.3.3,3.4.2,3.5.0}].__.test'
+            command: 'sshd[{2.12.20,2.13.14,3.4.2,3.5.0}].__.test'
 
           - java-version: 11
             command: 'amm.repl[2.12.{9,14,20}].__.test'
           - java-version: 17
             command: 'amm.repl[2.13.{4,9,14}].__.test'
           - java-version: 21
-            command: 'amm.repl[{3.3.3,3.4.2,3.5.0}].__.test'
+            command: 'amm.repl[{3.4.2,3.5.0}].__.test'
 
           - java-version: 11
             command: 'amm[2.12.{9,14,20}].__.test'
           - java-version: 17
             command: 'amm[2.13.{4,9,14}].__.test'
           - java-version: 21
-            command: 'amm[{3.3.3,3.4.2,3.5.0}].__.test'
+            command: 'amm[{3.4.2,3.5.0}].__.test'
 
     runs-on: ubuntu-latest
     steps:
@@ -45,7 +45,7 @@ jobs:
         with:
           java-version: ${{ matrix.java-version }}
           distribution: temurin
-      - run: ./mill -i -k -j4 "${{ matrix.command }}"
+      - run: ./mill -i -j1 -k "${{ matrix.command }}"
 
   itest:
     strategy:
@@ -57,7 +57,7 @@ jobs:
           - java-version: 17
             scala-version: '2.13.{4,9,14}'
           - java-version: 21
-            scala-version: '{3.3.3,3.4.2,3.5.0}'
+            scala-version: '{3.4.2,3.5.0}'
 
     runs-on: ubuntu-latest
     steps:
@@ -68,7 +68,7 @@ jobs:
         with:
           java-version: ${{ matrix.java-version }}
           distribution: temurin
-      - run: ./mill -i -k 'integration[${{ matrix.scala-version }}].__.test'
+      - run: ./mill -i -j1 -k 'integration[${{ matrix.scala-version }}].__.test'
 
   site:
     runs-on: ubuntu-latest

diff --git a/amm/util/src/main/scala/ammonite/util/Imports.scala b/amm/util/src/main/scala/ammonite/util/Imports.scala
@@ -56,7 +56,7 @@ case class ImportData(
 )
 
 object ImportData {
-  sealed case class ImportType(name: String)
+  case class ImportType(name: String)
   val Type = ImportType("Type")
   val Term = ImportType("Term")
   val TermType = ImportType("TermType")

diff --git a/build.sc b/build.sc
@@ -61,20 +61,17 @@ val scala2_12Versions = 9.to(20)
 val scala2_13Versions = 2.to(14)
 //  .dropWhile(v => isJava21 && v < 11)
   .map(v => s"2.13.${v}")
-val scala33Versions = Seq("3.3.0", "3.3.1", "3.3.2", "3.3.3")
-//  .dropWhile(v => isJava21 && v == "3.3.0")
 val scala34Versions = Seq("3.4.2")
 val scala35Versions = Seq("3.5.0")
 
 val scala2Versions = scala2_12Versions ++ scala2_13Versions
-val scala3Versions = scala33Versions ++ scala34Versions ++ scala35Versions
+val scala3Versions = scala34Versions ++ scala35Versions
 
 val binCrossScalaVersions =
-  Seq(scala2_12Versions.last, scala2_13Versions.last, scala33Versions.last)
+  Seq(scala2_12Versions.last, scala2_13Versions.last, scala34Versions.last)
 val assemblyCrossScalaVersions = Seq(
   scala2_12Versions.last,
   scala2_13Versions.last,
-  scala33Versions.last,
   scala34Versions.last,
   scala35Versions.last,
 )
@@ -120,10 +117,10 @@ object Deps {
   val jlineReader = ivy"org.jline:jline-reader:3.14.1"
   val jlineTerminal = ivy"org.jline:jline-terminal:3.14.1"
   val jsch = ivy"com.jcraft:jsch:0.1.55"
-  val mainargs = ivy"com.lihaoyi::mainargs:0.5.4"
-  val osLib = ivy"com.lihaoyi::os-lib:0.10.6"
+  val mainargs = ivy"com.lihaoyi::mainargs:0.7.5"
+  val osLib = ivy"com.lihaoyi::os-lib:0.10.7"
   val pprint = ivy"com.lihaoyi::pprint:0.9.0"
-  val requests = ivy"com.lihaoyi::requests:0.8.3"
+  val requests = ivy"com.lihaoyi::requests:0.9.0"
   val scalacheck = ivy"org.scalacheck::scalacheck:1.18.0"
   val scalaCollectionCompat = ivy"org.scala-lang.modules::scala-collection-compat:2.12.0"
   def scalaCompiler(scalaVersion: String) = ivy"org.scala-lang:scala-compiler:${scalaVersion}"
@@ -140,17 +137,13 @@ object Deps {
   val semanticDbScalac = ivy"org.scalameta:::semanticdb-scalac:$scalametaVersion"
   val shapeless = ivy"com.chuusai::shapeless:2.3.3"
   val slf4jNop = ivy"org.slf4j:slf4j-nop:1.7.36"
-  val sourcecode = ivy"com.lihaoyi::sourcecode:0.4.2"
+  val sourcecode = ivy"com.lihaoyi::sourcecode:0.4.3-M1"
   val sshdCore = ivy"org.apache.sshd:sshd-core:1.2.0"
   val scalametaCommon = ivy"org.scalameta::common:$scalametaVersion"
   val typename = ivy"org.tpolecat::typename:1.1.0"
-  def upickle(sv: String) = {
-    val ver =
-      if (sv.startsWith("3.2.")) "3.1.0"
-      else "3.1.3"
-    ivy"com.lihaoyi::upickle:$ver"
-  }
-  val utest = ivy"com.lihaoyi::utest:0.8.3"
+  val upickle = ivy"com.lihaoyi::upickle:4.0.1"
+
+  val utest = ivy"com.lihaoyi::utest:0.8.4"
 }
 
 trait AmmInternalModule extends CrossSbtModule with Bloop.Module {
@@ -366,7 +359,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions) {
     def isCrossFullScalaVersion = true
     def ivyDeps = super.ivyDeps() ++ Agg(
       Deps.classPathUtil,
-      Deps.upickle(crossScalaVersion),
+      Deps.upickle,
       Deps.requests,
       Deps.mainargs,
       Deps.coursierDependencyInterface