Skip to content

Commit

Permalink
Bump misc dependencies (#118)
Browse files Browse the repository at this point in the history
* Adjust `mill` launchers to 0.11.13

* Bump `mill-native-image-upload` to 0.1.29

* Bump `coursier` to 2.1.24

* [NIT] remove redundant code
  • Loading branch information
Gedochao authored Jan 23, 2025
1 parent 94595ed commit d964ca7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
15 changes: 5 additions & 10 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.1`
import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.29`
import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.26`
import $ivy.`io.get-coursier::coursier-launcher:2.1.9`
import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.29`
import $ivy.`io.get-coursier::coursier-launcher:2.1.24`

import de.tobiasroeser.mill.vcs.version._
import io.github.alexarchambault.millnativeimage.NativeImage
import io.github.alexarchambault.millnativeimage.upload.Upload
import mill._
import mill.scalalib._
import coursier.core.Version

import java.io.File

import scala.concurrent.duration._
import scala.util.Properties.isWin


def scalaJsCliVersion = "1.1.1-sc5"
def scala213 = "2.13.16"
def scalaJsVersion = "1.18.1"
object cli extends Cli
Expand Down Expand Up @@ -129,7 +124,7 @@ object native extends ScalaJsCliNativeImage

def native0 = native

def csDockerVersion = "2.1.9"
def csVersion = "2.1.24"

trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage {
def nameSuffix = "-static"
Expand All @@ -143,7 +138,7 @@ trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage {
Some(
NativeImage.linuxStaticParams(
"scala-cli-base-musl:latest",
s"https://github.com/coursier/coursier/releases/download/v$csDockerVersion/cs-x86_64-pc-linux.gz"
s"https://github.com/coursier/coursier/releases/download/v$csVersion/cs-x86_64-pc-linux.gz"
)
)
}
Expand All @@ -159,7 +154,7 @@ trait ScalaJsCliMostlyStaticNativeImage extends ScalaJsCliNativeImage {
def nativeImageDockerParams = Some(
NativeImage.linuxMostlyStaticParams(
"ubuntu:18.04", // TODO Pin that?
s"https://github.com/coursier/coursier/releases/download/v$csDockerVersion/cs-x86_64-pc-linux.gz"
s"https://github.com/coursier/coursier/releases/download/v$csVersion/cs-x86_64-pc-linux.gz"
)
)
}
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Licensed under the Apache License, Version 2.0


DEFAULT_MILL_VERSION=0.11.7
DEFAULT_MILL_VERSION=0.11.13

set -e

Expand Down
2 changes: 1 addition & 1 deletion mill.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rem setlocal seems to be unavailable on Windows 95/98/ME
rem but I don't think we need to support them in 2019
setlocal enabledelayedexpansion

set "DEFAULT_MILL_VERSION=0.11.7"
set "DEFAULT_MILL_VERSION=0.11.13"

set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill"

Expand Down

0 comments on commit d964ca7

Please sign in to comment.