@@ -14,13 +14,13 @@ lazy val commonSettings = Seq(
14
14
|See the NOTICE file distributed with this work for
15
15
|additional information regarding copyright ownership.
16
16
| """ .stripMargin)),
17
- scalaModuleMimaPreviousVersion := Some (" 2.1.4 " )
17
+ scalaModuleMimaPreviousVersion := None // TODO: change to ` Some("3.0.0") once we publish
18
18
)
19
19
20
20
lazy val root = project
21
21
.in(file(" ." ))
22
22
.settings(commonSettings)
23
- .settings(name := " scala-collection -compat" )
23
+ .settings(name := " scala-library -compat" )
24
24
.settings(dontPublish)
25
25
.aggregate(
26
26
compat211JVM,
@@ -56,8 +56,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
56
56
_.settings(scalaModuleSettings)
57
57
.settings(commonSettings)
58
58
.settings(
59
- name := " scala-collection -compat" ,
60
- moduleName := " scala-collection -compat" ,
59
+ name := " scala-library -compat" ,
60
+ moduleName := " scala-library -compat" ,
61
61
scalacOptions ++= Seq (" -feature" , " -language:higherKinds" , " -language:implicitConversions" ),
62
62
unmanagedSourceDirectories in Compile += {
63
63
val sharedSourceDir = (baseDirectory in ThisBuild ).value / " compat/src/main"
@@ -72,7 +72,7 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
72
72
.jsSettings(
73
73
scalacOptions += {
74
74
val x = (baseDirectory in LocalRootProject ).value.toURI.toString
75
- val y = " https://raw.githubusercontent.com/scala/scala-collection -compat/" + sys.process
75
+ val y = " https://raw.githubusercontent.com/scala/scala-library -compat/" + sys.process
76
76
.Process (" git rev-parse HEAD" )
77
77
.lineStream_!
78
78
.head
@@ -188,12 +188,14 @@ lazy val `scalafix-input` = project
188
188
)
189
189
.dependsOn(`scalafix-data212`)
190
190
191
- val `scalafix-output` = MultiScalaProject (" scalafix-output" ,
192
- " scalafix/output" ,
193
- _.settings(sharedScalafixSettings)
194
- .settings(commonSettings)
195
- .settings(dontPublish)
196
- .disablePlugins(ScalafixPlugin ))
191
+ val `scalafix-output` = MultiScalaProject (
192
+ " scalafix-output" ,
193
+ " scalafix/output" ,
194
+ _.settings(sharedScalafixSettings)
195
+ .settings(commonSettings)
196
+ .settings(dontPublish)
197
+ .disablePlugins(ScalafixPlugin )
198
+ )
197
199
198
200
lazy val outputCross =
199
201
Def .setting((baseDirectory in ThisBuild ).value / " scalafix/output/src/main/scala" )
@@ -243,10 +245,12 @@ lazy val `scalafix-tests` = project
243
245
.settings(
244
246
scalaVersion := scalafixScala212,
245
247
libraryDependencies += " ch.epfl.scala" % " scalafix-testkit" % scalafixVersion % Test cross CrossVersion .full,
246
- scalafixTestkitOutputSourceDirectories := Seq (outputCross.value,
247
- output212.value,
248
- output212Plus.value,
249
- output213.value),
248
+ scalafixTestkitOutputSourceDirectories := Seq (
249
+ outputCross.value,
250
+ output212.value,
251
+ output212Plus.value,
252
+ output213.value
253
+ ),
250
254
scalafixTestkitInputSourceDirectories := sourceDirectories.in(`scalafix-input`, Compile ).value,
251
255
scalafixTestkitInputClasspath := fullClasspath.in(`scalafix-input`, Compile ).value
252
256
)
@@ -258,7 +262,7 @@ lazy val dontPublish = Seq(
258
262
packagedArtifacts := Map .empty,
259
263
publish := {},
260
264
publishLocal := {},
261
- scalaModuleMimaPreviousVersion := None ,
265
+ scalaModuleMimaPreviousVersion := None
262
266
)
263
267
264
268
val travisScalaVersion = sys.env.get(" TRAVIS_SCALA_VERSION" ).flatMap(Version .parse)
@@ -333,7 +337,7 @@ inThisBuild(
333
337
s " $projectPrefix/publishSigned " ,
334
338
" sonatypePrepare" ,
335
339
" sonatypeBundleUpload" ,
336
- " sonatypeClose" ,
340
+ " sonatypeClose"
337
341
)
338
342
} else {
339
343
Nil
@@ -355,4 +359,5 @@ inThisBuild(
355
359
val newCommands = toRun.toList.map(Exec (_, None ))
356
360
state.copy(remainingCommands = newCommands ::: state.remainingCommands)
357
361
}
358
- ))
362
+ )
363
+ )
0 commit comments