Skip to content

Commit 65d5929

Browse files
authored
dep: various updates (com-lihaoyi#46)
This pr updates the following: - adds in dependabot to ensure github actions stay up to date - updates checkout and java actions - updates utest - updates to the latest Mill Pull request: com-lihaoyi#46
1 parent 72c511f commit 65d5929

File tree

5 files changed

+25
-18
lines changed

5 files changed

+25
-18
lines changed

.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

.github/workflows/actions.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-java@v1
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-java@v3
1515
with:
16+
distribution: 'temurin'
1617
java-version: 8
1718
- name: Run tests
1819
run: ./mill -i all __.publishArtifacts __.test
@@ -30,9 +31,10 @@ jobs:
3031
LC_MESSAGES: "en_US.UTF-8"
3132
LC_ALL: "en_US.UTF-8"
3233
steps:
33-
- uses: actions/checkout@v2
34-
- uses: actions/setup-java@v1
34+
- uses: actions/checkout@v3
35+
- uses: actions/setup-java@v3
3536
with:
37+
distribution: 'temurin'
3638
java-version: 8
3739
- name: Publish to Maven Central
3840
run: |

.mill-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.10.5

build.sc

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import mill._, scalalib._, publish._
2-
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
2+
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4`
33
import de.tobiasroeser.mill.vcs.version.VcsVersion
44

55
object acyclic extends Cross[AcyclicModule](
@@ -15,23 +15,19 @@ class AcyclicModule(val crossScalaVersion: String) extends CrossScalaModule with
1515
def pomSettings = PomSettings(
1616
description = artifactName(),
1717
organization = "com.lihaoyi",
18-
url = "https://github.com/lihaoyi/acyclic",
18+
url = "https://github.com/com-lihaoyi/acyclic",
1919
licenses = Seq(License.MIT),
20-
scm = SCM(
21-
"git://github.com/lihaoyi/acyclic.git",
22-
"scm:git://github.com/lihaoyi/acyclic.git"
23-
),
20+
versionControl = VersionControl.github(owner = "com-lihaoyi", repo = "acyclic"),
2421
developers = Seq(
2522
Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi")
2623
)
2724
)
2825
def compileIvyDeps = Agg(ivy"org.scala-lang:scala-compiler:$crossScalaVersion")
2926

30-
object test extends Tests {
31-
def testFrameworks = Seq("utest.runner.Framework")
27+
object test extends Tests with TestModule.Utest {
3228
def sources = T.sources(millSourcePath / "src", millSourcePath / "resources")
3329
def ivyDeps = Agg(
34-
ivy"com.lihaoyi::utest:0.7.7",
30+
ivy"com.lihaoyi::utest:0.8.0",
3531
ivy"org.scala-lang:scala-compiler:$crossScalaVersion"
3632
)
3733
}

mill

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# This is a wrapper script, that automatically download mill from GitHub release pages
44
# You can give the required mill version with MILL_VERSION env variable
55
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
6-
DEFAULT_MILL_VERSION=0.9.5-52-ef6d5d
6+
DEFAULT_MILL_VERSION=0.10.5
77

88
set -e
99

1010
if [ -z "$MILL_VERSION" ] ; then
1111
if [ -f ".mill-version" ] ; then
1212
MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
13-
elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then
13+
elif [ -f "mill" ] && [ "$0" != "mill" ] ; then
1414
MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2)
1515
else
1616
MILL_VERSION=$DEFAULT_MILL_VERSION
@@ -28,13 +28,14 @@ version_remainder="$MILL_VERSION"
2828
MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
2929
MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
3030

31-
if [ ! -x "$MILL_EXEC_PATH" ] ; then
32-
mkdir -p $MILL_DOWNLOAD_PATH
31+
if [ ! -s "$MILL_EXEC_PATH" ] ; then
32+
mkdir -p "$MILL_DOWNLOAD_PATH"
3333
if [ "$MILL_MAJOR_VERSION" -gt 0 ] || [ "$MILL_MINOR_VERSION" -ge 5 ] ; then
3434
ASSEMBLY="-assembly"
3535
fi
3636
DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
37-
MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
37+
MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
38+
MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION_TAG}/$MILL_VERSION${ASSEMBLY}"
3839
curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
3940
chmod +x "$DOWNLOAD_FILE"
4041
mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"

0 commit comments

Comments
 (0)