bump deps

bleep-model/src/scala/bleep/FetchJvm.scala

@@ -1,7 +1,7 @@
 package bleep
 
 import coursier.cache.{ArchiveCache, CacheLogger, FileCache}
-import coursier.jvm.{JavaHome, JvmCache, JvmIndex}
+import coursier.jvm.{JavaHome, JvmCache, JvmChannel}
 import coursier.util.Task
 
 import java.nio.file.{Files, Path}
@@ -54,7 +54,7 @@ object FetchJvm {
     val fileCache = FileCache[Task]().withLogger(cacheLogger)
     val jvmCache = JvmCache()
       .withArchiveCache(ArchiveCache[Task]().withCache(fileCache))
-      .withIndex(jvm.index.getOrElse(JvmIndex.coursierIndexUrl))
+      .withIndex(jvm.index.getOrElse(JvmChannel.gitHubIndexUrl))
       .withArchitecture(arch)
     val javaBin = Await.result(JavaHome().withCache(jvmCache).javaBin(jvm.name).value(ec), Duration.Inf)
     javaBin

bleep-model/src/scala/bleep/FetchSbt.scala

@@ -1,7 +1,7 @@
 package bleep
 
 import coursier.cache.{ArchiveCache, CacheLogger, FileCache}
-import coursier.jvm.JvmIndex
+import coursier.jvm.JvmChannel
 import coursier.util.{Artifact, Task}
 
 import java.nio.file.Path
@@ -13,7 +13,7 @@ class FetchSbt(logger: CacheLogger, ec: ExecutionContext) {
     val url = s"https://github.com/sbt/sbt/releases/download/v$version/sbt-$version.zip"
     val fileCache = FileCache[Task]().withLogger(logger)
     val cache = ArchiveCache[Task]().withCache(fileCache)
-    val os = JvmIndex.defaultOs()
+    val os = JvmChannel.defaultOs()
 
     Await.result(cache.get(Artifact(url)).value(ec), Duration.Inf) match {
       case Left(value) => throw new BleepException.Cause(value, s"couldn't download sbt version $version from url $url")

bleep-model/src/scala/bleep/FetchScalafmt.scala

@@ -1,7 +1,7 @@
 package bleep
 
 import coursier.cache.{CacheLogger, FileCache}
-import coursier.jvm.JvmIndex
+import coursier.jvm.JvmChannel
 import coursier.util.{Artifact, Task}
 
 import java.nio.file.Path
@@ -10,7 +10,7 @@ import scala.concurrent.{Await, ExecutionContext}
 
 object FetchScalafmt {
   def apply(cacheLogger: CacheLogger, ec: ExecutionContext, version: String): Path = {
-    val filename = JvmIndex.defaultOs() match {
+    val filename = JvmChannel.defaultOs() match {
       case "darwin" =>
         "scalafmt-macos"
       case "linux" =>

bleep.yaml

@@ -1,5 +1,5 @@
 $schema: https://raw.githubusercontent.com/oyvindberg/bleep/master/schema.json
-$version: 0.0.8
+$version: 0.0.9
 jvm:
   name: graalvm-community:21.0.2
 projects:
@@ -21,12 +21,12 @@ projects:
   bleep-core:
     dependencies:
     - for3Use213: true
-      module: ch.epfl.scala::bloop-config:2.0.3
+      module: ch.epfl.scala::bloop-config:2.1.0
     - for3Use213: true
-      module: ch.epfl.scala::bloop-rifle:2.0.0
+      module: ch.epfl.scala::bloop-rifle:2.0.5
+    - com.olvind.ryddig::ryddig:0.0.5
     - com.swoval:file-tree-views:2.1.12
     - org.typelevel::scalac-options:0.1.7
-    - com.olvind.ryddig::ryddig:0.0.4
     dependsOn:
     - bleep-model
     - bleep-nosbt
@@ -37,12 +37,12 @@ projects:
     - io.circe::circe-generic:0.14.10
     - io.circe::circe-yaml-v12:1.15.0
     - for3Use213: true
-      module: io.get-coursier::coursier-jvm:2.1.12
+      module: io.get-coursier::coursier-jvm:2.1.16
     - for3Use213: true
-      module: io.get-coursier::coursier-sbt-maven-repository:2.1.12
+      module: io.get-coursier::coursier-sbt-maven-repository:2.1.16
     - for3Use213: true
-      module: io.get-coursier::coursier:2.1.12
-    - org.snakeyaml:snakeyaml-engine:2.7
+      module: io.get-coursier::coursier:2.1.16
+    - org.snakeyaml:snakeyaml-engine:2.8
     extends: template-cross-all
     sourcegen:
       main: bleep.scripts.GenerateResources
@@ -75,12 +75,12 @@ projects:
     - ../liberated/sbt-dynver/dynver/src/main/scala
     - ../liberated/sbt-dynver/sbtdynver/src/main/scala
   bleep-plugin-git-versioning:
-    dependencies: se.sawano.java:alphanumeric-comparator:1.4.1
+    dependencies: se.sawano.java:alphanumeric-comparator:2.0.0
     dependsOn: bleep-core
     extends: template-cross-all
     sources: ../liberated/sbt-git-versioning/src/main/scala
   bleep-plugin-jni:
-    dependencies: org.ow2.asm:asm:9.7
+    dependencies: org.ow2.asm:asm:9.7.1
     dependsOn: bleep-core
     extends: template-cross-all
     sources:
@@ -94,8 +94,8 @@ projects:
     sources: ../liberated/mdoc/mdoc-sbt/src/main/scala
   bleep-plugin-native-image:
     dependencies:
-    - com.lihaoyi::os-lib:0.10.7
-    - org.ow2.asm:asm:9.7
+    - com.lihaoyi::os-lib:0.11.3
+    - org.ow2.asm:asm:9.7.1
     dependsOn: bleep-core
     extends: template-cross-all
     resources: ../liberated/sbt-native-image/plugin/src/main/resources
@@ -111,7 +111,7 @@ projects:
     - ../liberated/sbt-pgp/gpg-library/src/main/scala
     - ../liberated/sbt-pgp/sbt-pgp/src/main/scala
   bleep-plugin-scalafix:
-    dependencies: ch.epfl.scala:scalafix-interfaces:0.12.1
+    dependencies: ch.epfl.scala:scalafix-interfaces:0.13.0
     dependsOn: bleep-core
     extends: template-cross-all
     sources: ../liberated/mill-scalafix/mill-scalafix/src
@@ -122,14 +122,14 @@ projects:
     - com.softwaremill.sttp.client4::slf4j-backend:4.0.0-M16
     - com.softwaremill.sttp.client4::upickle:4.0.0-M16
     - org.sonatype.spice.zapper:spice-zapper:1.3
-    - org.wvlet.airframe::airframe-http:24.9.0
+    - org.wvlet.airframe::airframe-http:24.10.0
     dependsOn: bleep-core
     extends:
     - template-cross-all
     - template-parcollection-ok
     sources: ../liberated/sbt-sonatype/src/main/scala
   bleep-tests:
-    dependencies: org.scalatest::scalatest:3.3.0-SNAP4
+    dependencies: org.scalatest::scalatest:3.2.19
     dependsOn: bleep-cli
     extends:
     - template-common

scripts-init/src/scala/bleep/scripts/GenerateResources.scala

@@ -1,7 +1,7 @@
 package bleep
 package scripts
 
-import bleep.logging.Logger
+import ryddig.Logger
 import bleep.plugin.dynver.DynVerPlugin
 
 import java.nio.file.Files
@@ -18,7 +18,7 @@ object GenerateResources extends BleepCodegenScript("GenerateResources") {
 
   def writeVersion(target: Target, logger: Logger, version: String): Unit = {
     val to = target.sources / "bleep/model/BleepVersion.scala"
-    logger.withContext("project", target.project).warn(s"Writing $to")
+    logger.withContext("project", target.project.value).warn(s"Writing $to")
     val content =
       s"""|//
           |// GENERATED FILE!
@@ -45,7 +45,7 @@ object GenerateResources extends BleepCodegenScript("GenerateResources") {
   }
   def writeJvm(target: Target, logger: Logger, buildJvm: model.Jvm): Unit = {
     val to = target.sources / "bleep/model/Jvm.scala"
-    logger.withContext("project", target.project).warn(s"Writing $to")
+    logger.withContext("project", target.project.value).warn(s"Writing $to")
     val content =
       s"""|//
           |// GENERATED FILE!

scripts/src/scala/bleep/scripts/GenNativeImage.scala

@@ -10,7 +10,7 @@ object GenNativeImage extends BleepScript("GenNativeImage") {
     val jvm3 = model.CrossId("jvm3")
     val projectName = model.CrossProjectName(model.ProjectName("bleep-cli"), crossId = Some(jvm3))
     val project = started.bloopProject(projectName)
-    commands.compile(List(projectName))
+//    commands.compile(List(projectName))
 
     // this is here to pick up the graalvm installed by `graalvm/setup-graalvm@v1` in github actions *on windows*
     // the one we install ourselves does not work