@@ -66,8 +66,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
66
66
name := " scala-collection-compat" ,
67
67
moduleName := " scala-collection-compat" ,
68
68
scalacOptions ++= Seq (" -feature" , " -language:higherKinds" , " -language:implicitConversions" ),
69
- unmanagedSourceDirectories in Compile += {
70
- val sharedSourceDir = (baseDirectory in ThisBuild ).value / " compat/src/main"
69
+ Compile / unmanagedSourceDirectories += {
70
+ val sharedSourceDir = (ThisBuild / baseDirectory ).value / " compat/src/main"
71
71
if (scalaVersion.value.startsWith(" 2.13." )) sharedSourceDir / " scala-2.13"
72
72
else sharedSourceDir / " scala-2.11_2.12"
73
73
},
@@ -78,14 +78,14 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
78
78
)
79
79
.jsSettings(
80
80
scalacOptions += {
81
- val x = (baseDirectory in LocalRootProject ).value.toURI.toString
81
+ val x = (LocalRootProject / baseDirectory ).value.toURI.toString
82
82
val y = " https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
83
83
.Process (" git rev-parse HEAD" )
84
84
.lineStream_!
85
85
.head
86
86
s " -P:scalajs:mapSourceURI: $x-> $y/ "
87
87
},
88
- fork in Test := false // Scala.js cannot run forked tests
88
+ Test / fork := false // Scala.js cannot run forked tests
89
89
)
90
90
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin ))
91
91
.disablePlugins(ScalafixPlugin )
@@ -131,13 +131,13 @@ lazy val `binary-compat` = project
131
131
junit,
132
132
buildInfoPackage := " build" ,
133
133
buildInfoKeys := Seq [BuildInfoKey ](
134
- " oldClasses" -> (classDirectory in ( `binary-compat-old`, Compile ) ).value.toString,
135
- " newClasses" -> (classDirectory in ( `binary-compat-new`, Compile ) ).value.toString
134
+ " oldClasses" -> (`binary-compat-old` / Compile / classDirectory ).value.toString,
135
+ " newClasses" -> (`binary-compat-new` / Compile / classDirectory ).value.toString
136
136
),
137
- test in Test := (test in Test )
137
+ Test / test := (Test / test )
138
138
.dependsOn(
139
- compile in ( `binary-compat-old`, Compile ) ,
140
- compile in ( `binary-compat-new`, Compile )
139
+ `binary-compat-old` / Compile / compile ,
140
+ `binary-compat-new` / Compile / compile,
141
141
)
142
142
.value
143
143
)
@@ -149,8 +149,8 @@ lazy val `scalafix-rules` = project
149
149
.settings(scalaModuleSettings)
150
150
.settings(commonSettings)
151
151
.settings(
152
- organization := (organization in compat212JVM ).value,
153
- publishTo := (publishTo in compat212JVM ).value,
152
+ organization := (compat212JVM / organization ).value,
153
+ publishTo := (compat212JVM / publishTo ).value,
154
154
name := " scala-collection-migrations" ,
155
155
scalaVersion := scalafixScala212,
156
156
libraryDependencies += " ch.epfl.scala" %% " scalafix-core" % scalafixVersion
@@ -205,19 +205,19 @@ val `scalafix-output` = MultiScalaProject(
205
205
)
206
206
207
207
lazy val outputCross =
208
- Def .setting((baseDirectory in ThisBuild ).value / " scalafix/output/src/main/scala" )
208
+ Def .setting((ThisBuild / baseDirectory ).value / " scalafix/output/src/main/scala" )
209
209
210
210
lazy val output212 =
211
- Def .setting((baseDirectory in ThisBuild ).value / " scalafix/output212/src/main/scala" )
212
- lazy val addOutput212 = unmanagedSourceDirectories in Compile += output212.value
211
+ Def .setting((ThisBuild / baseDirectory ).value / " scalafix/output212/src/main/scala" )
212
+ lazy val addOutput212 = Compile / unmanagedSourceDirectories += output212.value
213
213
214
214
lazy val output212Plus =
215
- Def .setting((baseDirectory in ThisBuild ).value / " scalafix/output212+/src/main/scala" )
216
- lazy val addOutput212Plus = unmanagedSourceDirectories in Compile += output212Plus.value
215
+ Def .setting((ThisBuild / baseDirectory ).value / " scalafix/output212+/src/main/scala" )
216
+ lazy val addOutput212Plus = Compile / unmanagedSourceDirectories += output212Plus.value
217
217
218
218
lazy val output213 =
219
- Def .setting((baseDirectory in ThisBuild ).value / " scalafix/output213/src/main/scala" )
220
- lazy val addOutput213 = unmanagedSourceDirectories in Compile += output213.value
219
+ Def .setting((ThisBuild / baseDirectory ).value / " scalafix/output213/src/main/scala" )
220
+ lazy val addOutput213 = Compile / unmanagedSourceDirectories += output213.value
221
221
222
222
lazy val `scalafix-output211` = `scalafix-output`(
223
223
scala211,
0 commit comments