Skip to content

Commit b651b84

Browse files
committed
Update Scala Native 0.4.0
1 parent 6ce38d8 commit b651b84

File tree

3 files changed

+28
-23
lines changed

3 files changed

+28
-23
lines changed

build.sc

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import scalajslib._
44
import scalanativelib._
55
import publish._
66

7-
val scala212 = "2.12.11"
8-
val scala213 = "2.13.3"
7+
val scala212 = "2.12.13"
8+
val scala213 = "2.13.4"
99

1010
val crossVersions = Seq(scala212, scala213)
1111

12-
def acyclicVersion(scalaVersion: String) = if(scalaVersion.startsWith("2.11.")) "0.1.8" else "0.2.0"
13-
1412
object autowire extends Module{
1513
object jvm extends Cross[autowireJvmModule](crossVersions:_*)
1614
class autowireJvmModule(val crossScalaVersion: String) extends AutowireModule{
@@ -19,25 +17,25 @@ object autowire extends Module{
1917

2018
object js extends Cross[autowireJsModule](crossVersions:_*)
2119
class autowireJsModule(val crossScalaVersion: String) extends AutowireModule with ScalaJSModule{
22-
def scalaJSVersion = "1.2.0"
20+
def scalaJSVersion = "1.4.0"
2321
object test extends CommonTestModule with Tests
2422
}
2523

26-
object native extends Cross[autowireNativeModule]("2.11.12")
24+
object native extends Cross[autowireNativeModule](crossVersions:_*)
2725
class autowireNativeModule(val crossScalaVersion: String) extends AutowireModule with ScalaNativeModule{
28-
def scalaNativeVersion = "0.4.0-M2"
26+
def scalaNativeVersion = "0.4.0"
2927
object test extends CommonTestModule with Tests
3028
}
3129
}
3230

3331
trait AutowireModule extends CrossScalaModule with PublishModule{
34-
def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:${acyclicVersion(scalaVersion())}")
32+
def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.2.0")
3533
def compileIvyDeps = Agg(
36-
ivy"com.lihaoyi::acyclic:${acyclicVersion(scalaVersion())}",
34+
ivy"com.lihaoyi::acyclic:0.2.0",
3735
ivy"org.scala-lang:scala-reflect:${scalaVersion()}"
3836
)
3937
def artifactName = "autowire"
40-
def publishVersion = "0.3.2"
38+
def publishVersion = "0.3.3"
4139
def pomSettings = PomSettings(
4240
description = artifactName(),
4341
organization = "com.lihaoyi",
@@ -62,13 +60,13 @@ trait AutowireModule extends CrossScalaModule with PublishModule{
6260
trait CommonTestModule extends ScalaModule with TestModule{
6361
def ivyDeps = T{ super.ivyDeps() ++
6462
Agg(
65-
ivy"com.lihaoyi::utest::0.7.4",
66-
ivy"com.lihaoyi::upickle::1.1.0"
63+
ivy"com.lihaoyi::utest::0.7.7",
64+
ivy"com.lihaoyi::upickle::1.2.3"
6765
)
6866
}
69-
def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:${acyclicVersion(scalaVersion())}")
67+
def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.2.0")
7068
def compileIvyDeps = Agg(
71-
ivy"com.lihaoyi::acyclic:${acyclicVersion(scalaVersion())}",
69+
ivy"com.lihaoyi::acyclic:0.2.0",
7270
ivy"org.scala-lang:scala-reflect:${scalaVersion()}"
7371
)
7472
def testFrameworks = Seq("utest.runner.Framework")

mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
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.8.0
6+
DEFAULT_MILL_VERSION=0.9.5
77

88
set -e
99

readme.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Autowire 0.3.2
1+
Autowire 0.3.3
22
==============
33

44
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0.svg)](https://www.scala-js.org/)
@@ -38,30 +38,31 @@ Autowire is completely agnostic to both the serialization library, and the trans
3838
Getting Started
3939
===============
4040

41-
Autowire is available at the following maven coordinates, for Scala-JVM and Scala-JS (1.0.0+) respectively:
41+
Autowire is available at the following maven coordinates:
4242

4343
```scala
44-
"com.lihaoyi" %% "autowire" % "0.3.2"
45-
"com.lihaoyi" %%% "autowire" % "0.3.2"
44+
"com.lihaoyi" %% "autowire" % "0.3.3" // for Scala-JVM
45+
"com.lihaoyi" %%% "autowire" % "0.3.3" // Scala.js (1.4.0+) and Scala Native (0.4.0)
4646
```
4747

48-
This 0.3.2 can be used by publishing locally:
48+
This 0.3.3 can be used by publishing locally:
4949

5050
```scala
5151
git clone https://github.com/lihaoyi/autowire.git
5252
cd autowire
53-
sbt publishLocal
53+
./mill __.publishLocal
5454
```
55+
5556
And then add a library dependency in your `build.sbt` for your shared project:
5657

5758
```scala
5859
libraryDependencies ++= Seq(
59-
"com.lihaoyi" %%% "autowire" % "0.3.2",
60+
"com.lihaoyi" %%% "autowire" % "0.3.3",
6061
...
6162
)
6263
```
6364

64-
Autowire 0.3.2 works for Scala.js 1.x and both Scala 2.12 and 2.13
65+
Autowire 0.3.3 works for Scala.js 1.x and both Scala 2.12 and 2.13
6566
For Scala.js 0.6.x users, please use autowire 0.2.6.
6667

6768
Autowire works on both Scala-JVM and Scala-JS, meaning you can use it to get type-safe Ajax calls between a browser and your servers.
@@ -296,8 +297,14 @@ https://github.com/lihaoyi/workbench-example-app/tree/autowire
296297
Changelog
297298
=========
298299

300+
0.3.3
301+
-----
302+
303+
- Update to Scala Native 0.4.0
304+
299305
0.3.2
300306
-----
307+
301308
- Cross-publish for Scala 2.12 and 2.13
302309

303310
- Update to Scala-js 1.0.0+

0 commit comments

Comments
 (0)