10000 Update to Mill 1.0.0 by lihaoyi · Pull Request #378 · com-lihaoyi/utest · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update to Mill 1.0.0 #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 11, 2025
Merged

Update to Mill 1.0.0 #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
697fb3f
.
lihaoyi May 29, 2025
32c12b9
SonatypeCentralPublishModule
lihaoyi May 30, 2025
2dc86ea
1.0.0-final
lihaoyi Jul 11, 2025
2098829
1.0.0-final
lihaoyi Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .bsp/mill-bsp-0.12.14.resources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/lihaoyi/mill-bsp-worker_2.13/0.12.14/mill-bsp-worker_2.13-0.12.14.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/ch/epfl/scala/bsp4j/2.2.0-M2/bsp4j-2.2.0-M2.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-sbt/test-interface/1.0/test-interface-1.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.15/scala-library-2.13.15.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/lihaoyi/mill-moduledefs_2.13/0.11.2/mill-moduledefs_2.13-0.11.2.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.generator/0.20.1/org.eclipse.lsp4j.generator-0.20.1.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.20.1/org.eclipse.lsp4j.jsonrpc-0.20.1.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.3.0/sourcecode_2.13-0.3.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/eclipse/xtend/org.eclipse.xtend.lib/2.28.0/org.eclipse.xtend.lib-2.28.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.13.15/scala-reflect-2.13.15.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/io/github/java-diff-utils/java-diff-utils/4.12/java-diff-utils-4.12.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/jline/jline/3.26.3/jline-3.26.3.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/eclipse/xtext/org.eclipse.xtext.xbase.lib/2.28.0/org.eclipse.xtext.xbase.lib-2.28.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/eclipse/xtend/org.eclipse.xtend.lib.macro/2.28.0/org.eclipse.xtend.lib.macro-2.28.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar
file:/Users/lihaoyi/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
1 change: 1 addition & 0 deletions .bsp/mill-bsp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"mill-bsp","argv":["/Users/lihaoyi/Github/utest/mill","--bsp","--ticker","false","--color","false","--jobs","1"],"millVersion":"0.12.14","bspVersion":"2.2.0-M2","languages":["java","scala","kotlin"]}
14 changes: 5 additions & 9 deletions .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,13 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
fetch-depth: 0

- uses: coursier/cache-action@v6

- uses: actions/setup-java@v4
with:
java-version: '11'
distribution: temurin
distribution: 'temurin'
java-version: 11
- name: Publish to Maven Central
run: ./mill -i mill.scalalib.SonatypeCentralPublishModule/

- run: ./mill -i mill.scalalib.SonatypeCentralPublishModule/
- name: Create GitHub Release
id: create_gh_release
uses: actions/create-release@v1.1.4
Expand Down
1 change: 0 additions & 1 deletion .mill-version
View file
Open in desktop

This file was deleted.

35 changes: 18 additions & 17 deletions build.mill
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
//| mill-version: 1.0.0
//| mvnDeps:
//| - com.github.lolgab::mill-mima_mill1:0.2.0
package build
import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import $ivy.`com.github.lolgab::mill-mima::0.1.1`
import mill.util.VcsVersion
import com.github.lolgab.mill.mima._

val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
Expand Down Expand Up @@ -42,31 +43,31 @@ object utest extends Module {
object jvm extends Cross[JvmUtestModule](scalaVersions)
trait JvmUtestModule
extends UtestMainModule {
def ivyDeps = Agg(
ivy"org.scala-sbt:test-interface::1.0"
) ++ (if (crossScalaVersion.startsWith("2")) Agg(
ivy"org.portable-scala::portable-scala-reflect::$scalaReflectVersion",
ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
) else Agg())
def mvnDeps = Seq(
mvn"org.scala-sbt:test-interface::1.0"
) ++ (if (crossScalaVersion.startsWith("2")) Seq(
mvn"org.portable-scala::portable-scala-reflect::$scalaReflectVersion",
mvn"org.scala-lang:scala-reflect:$crossScalaVersion"
) else Seq())
object test extends ScalaTests with UtestTestModule
}

object js extends Cross[JsUtestModule](scalaVersions)
trait JsUtestModule extends UtestMainModule with ScalaJSModule{
def ivyDeps = Agg(
ivy"org.scala-js::scalajs-test-interface:${scalaJSVersion()}".withDottyCompat(crossScalaVersion),
ivy"org.portable-scala::portable-scala-reflect::$scalaReflectVersion".withDottyCompat(crossScalaVersion)
) ++ (if(crossScalaVersion.startsWith("2")) Agg(
ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
) else Agg())
def mvnDeps = Seq(
mvn"org.scala-js::scalajs-test-interface:${scalaJSVersion()}".withDottyCompat(crossScalaVersion),
mvn"org.portable-scala::portable-scala-reflect::$scalaReflectVersion".withDottyCompat(crossScalaVersion)
) ++ (if(crossScalaVersion.startsWith("2")) Seq(
mvn"org.scala-lang:scala-reflect:$crossScalaVersion"
) else Seq())
def scalaJSVersion = "1.16.0"
object test extends ScalaJSTests with UtestTestModule
}

object native extends Cross[NativeUtestModule](scalaVersions)
trait NativeUtestModule extends UtestMainModule with ScalaNativeModule {
def ivyDeps = super.ivyDeps() ++ Agg(
ivy"org.scala-native::test-interface::${scalaNativeVersion()}"
def mvnDeps = super.mvnDeps() ++ Seq(
mvn"org.scala-native::test-interface::${scalaNativeVersion()}"
)

def scalaNativeVersion = "0.5.4"
Expand Down
0