Skip to content

Commit

Permalink
Merge branch 'main' into update-zinc
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi authored Dec 29, 2024
2 parents c2a7a6d + 4cc94cf commit 01103c8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
12 changes: 6 additions & 6 deletions build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ object Deps {
val playVersion = "2.8.22"
}
object Play_2_9 extends Play {
val playVersion = "2.9.5"
val playVersion = "2.9.6"
}
object Play_3_0 extends Play {
val playVersion = "3.0.5"
val playVersion = "3.0.6"
}
val play =
Seq(Play_3_0, Play_2_9, Play_2_8, Play_2_7, Play_2_6).map(p => (p.playBinVersion, p)).toMap
Expand Down Expand Up @@ -138,7 +138,7 @@ object Deps {
ivy"com.caoccao.javet:javet-macos:4.0.0"
)

val jline = ivy"org.jline:jline:3.27.1"
val jline = ivy"org.jline:jline:3.28.0"
val jnaVersion = "5.15.0"
val jna = ivy"net.java.dev.jna:jna:${jnaVersion}"
val jnaPlatform = ivy"net.java.dev.jna:jna-platform:${jnaVersion}"
Expand Down Expand Up @@ -170,11 +170,11 @@ object Deps {
val scalatags = ivy"com.lihaoyi::scalatags:0.12.0"
def scalaXml = ivy"org.scala-lang.modules::scala-xml:2.3.0"
// keep in sync with doc/antora/antory.yml
val semanticDBscala = ivy"org.scalameta:::semanticdb-scalac:4.11.0"
val semanticDBscala = ivy"org.scalameta:::semanticdb-scalac:4.12.3"
val semanticDbJava = ivy"com.sourcegraph:semanticdb-java:0.10.3"
val sourcecode = ivy"com.lihaoyi::sourcecode:0.4.2"
val upickle = ivy"com.lihaoyi::upickle:3.3.1"
val windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.5"
val windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.6"
val zinc = ivy"org.scala-sbt::zinc:1.10.7"
// keep in sync with doc/antora/antory.yml
val bsp4j = ivy"ch.epfl.scala:bsp4j:2.2.0-M2"
Expand Down Expand Up @@ -235,7 +235,7 @@ object Deps {
ivy"org.apache.ant:ant:1.10.15",
Deps.commonsIo,
ivy"com.google.code.gson:gson:2.11.0",
ivy"com.google.protobuf:protobuf-java:4.28.2",
ivy"com.google.protobuf:protobuf-java:4.29.2",
ivy"com.google.guava:guava:33.3.1-jre",
ivy"org.yaml:snakeyaml:2.3",
ivy"org.apache.commons:commons-compress:1.27.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ object `package` extends RootModule with PythonModule {
/** Usage

> ./mill run
b'"Hello, world!"'
Hello, world!

*/
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# this comes from a wheel
import jinja2

# this comes from an sdist
import orjson as oj

environment = jinja2.Environment()
template = environment.from_string("Hello, {{ name }}!")
print(oj.dumps(template.render(name="world")))
print(template.render(name="world"))

0 comments on commit 01103c8

Please sign in to comment.