@@ -3,56 +3,39 @@ import scalalib._
3
3
import scalajslib ._
4
4
import scalanativelib ._
5
5
import publish ._
6
- import mill .scalalib .api .Util .isScala3
7
6
8
- val scala213 = " 2.13.7 "
9
- val scala31 = " 3.1.0 "
7
+ val scala212 = " 2.12.13 "
8
+ val scala213 = " 2.13.4 "
10
9
11
- val scalaJS06 = " 0.6.33"
12
- val scalaJS1 = " 1.8.0"
13
- val scalaNative = " 0.4.0"
14
-
15
- val crossVersions = Seq (scala213, scala31)
16
-
17
- val scalaJSVersions = Seq (
18
- (scala213, scalaJS06),
19
- (scala213, scalaJS1),
20
- (scala31, scalaJS1)
21
- )
22
-
23
- val scalaNativeVersions = Seq (
24
- (scala213, scalaNative)
25
- )
10
+ val crossVersions = Seq (scala212, scala213)
26
11
27
12
object autowire extends Module {
28
13
object jvm extends Cross [autowireJvmModule](crossVersions:_* )
29
14
class autowireJvmModule (val crossScalaVersion : String ) extends AutowireModule {
30
15
object test extends Tests with CommonTestModule
31
16
}
32
17
33
- object js extends Cross [autowireJsModule](scalaJSVersions :_* )
34
- class autowireJsModule (val crossScalaVersion : String , val crossScalaJSVersion : String ) extends AutowireModule with ScalaJSModule {
35
- def scalaJSVersion = " 1.8 .0"
18
+ object js extends Cross [autowireJsModule](crossVersions :_* )
19
+ class autowireJsModule (val crossScalaVersion : String ) extends AutowireModule with ScalaJSModule {
20
+ def scalaJSVersion = " 1.4 .0"
36
21
object test extends CommonTestModule with Tests
37
22
}
38
23
39
- object native extends Cross [autowireNativeModule](scalaNativeVersions :_* )
24
+ object native extends Cross [autowireNativeModule](crossVersions :_* )
40
25
class autowireNativeModule (val crossScalaVersion : String ) extends AutowireModule with ScalaNativeModule {
41
26
def scalaNativeVersion = " 0.4.0"
42
27
object test extends CommonTestModule with Tests
43
28
}
44
29
}
45
30
46
31
trait AutowireModule extends CrossScalaModule with PublishModule {
47
- def scalacPluginIvyDeps = Agg (ivy " com.lihaoyi:acyclic_2.13.0:0.3.0 " )
48
- def compileIvyDeps = if (! isScala3(crossScalaVersion)) Agg (
49
- ivy " com.lihaoyi:acyclic_2.13.0:0.3.0 " ,
50
- ivy " org.scala-lang:scala-reflect: ${crossScalaVersion}"
51
- )
52
- else Agg .empty[Dep ]
53
-
32
+ def scalacPluginIvyDeps = Agg (ivy " com.lihaoyi::acyclic:0.2.0 " )
33
+ def compileIvyDeps = Agg (
34
+ ivy " com.lihaoyi::acyclic:0.2.0 " ,
35
+ ivy " org.scala-lang:scala-reflect: ${scalaVersion()}"
36
+ )
54
37
def artifactName = " autowire"
55
- def publishVersion = " 0.3.4 "
38
+ def publishVersion = " 0.3.3 "
56
39
def pomSettings = PomSettings (
57
40
description = artifactName(),
58
41
organization = " com.lihaoyi" ,
@@ -75,20 +58,16 @@ trait AutowireModule extends CrossScalaModule with PublishModule{
75
58
def millSourcePath = super .millSourcePath / os.up
76
59
}
77
60
trait CommonTestModule extends ScalaModule with TestModule {
78
-
79
- def ivyDeps = T { super .ivyDeps() ++
61
+ def ivyDeps = T { super .ivyDeps() ++
80
62
Agg (
81
- ivy " com.lihaoyi::utest::0.7.10 " ,
82
- ivy " com.lihaoyi::upickle::1.4 .3 "
63
+ ivy " com.lihaoyi::utest::0.7.7 " ,
64
+ ivy " com.lihaoyi::upickle::1.2 .3 "
83
65
)
84
66
}
85
- def scalacPluginIvyDeps = Agg (ivy " com.lihaoyi:acyclic_2.13.0:0.3.0 " )
86
- def compileIvyDeps = T {
87
- if (! isScala3(scalaVersion())) Agg (
88
- ivy " com.lihaoyi::acyclic:0.2.0 " ,
89
- ivy " org.scala-lang:scala-reflect:2.13.7 "
90
- )
91
- else Agg .empty[Dep ]
92
- }
67
+ def scalacPluginIvyDeps = Agg (ivy " com.lihaoyi::acyclic:0.2.0 " )
68
+ def compileIvyDeps = Agg (
69
+ ivy " com.lihaoyi::acyclic:0.2.0 " ,
70
+ ivy " org.scala-lang:scala-reflect: ${scalaVersion()}"
71
+ )
93
72
def testFrameworks = Seq (" utest.runner.Framework" )
94
73
}
0 commit comments