Skip to content

Commit 080d33a

Browse files
committed
rip out latest-Scala-2.13 stuff
it would be cool if this became available as an sbt plugin, maybe. but with RC1 close now I don't think we need it
1 parent 4dc497f commit 080d33a

File tree

2 files changed

+4
-63
lines changed

2 files changed

+4
-63
lines changed

build.sbt

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,9 @@ lazy val root = project
2929

3030
lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
3131

32-
lazy val scala211 = "2.11.12"
33-
lazy val scala212 = "2.12.8"
34-
lazy val scalaJs213 = "2.13.0-M5" // Scala.js does no have -pre
35-
32+
lazy val scala211 = "2.11.12"
33+
lazy val scala212 = "2.12.8"
3634
lazy val scala213 = "2.13.0-M5"
37-
// lazy val scala213 = "2.13.0-pre-3ae6282" // use the sbt command `latest-213` to fetch the latest version
38-
39-
lazy val scala213Settings = Seq(
40-
resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
41-
scalaVersion := scala213
42-
)
4335

4436
lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform)(
4537
"compat",
@@ -77,7 +69,7 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform)(
7769

7870
val compat211 = compat(scala211)
7971
val compat212 = compat(scala212)
80-
val compat213 = compat(scala213, scalaJs213, _.jvmSettings(scala213Settings))
72+
val compat213 = compat(scala213)
8173

8274
lazy val compat211JVM = compat211.jvm
8375
lazy val compat211JS = compat211.js
@@ -150,8 +142,7 @@ lazy val `scalafix-data` = MultiScalaProject(
150142

151143
val `scalafix-data211` = `scalafix-data`(scala211, _.dependsOn(compat211JVM))
152144
val `scalafix-data212` = `scalafix-data`(scalafixScala212, _.dependsOn(compat212JVM))
153-
val `scalafix-data213` =
154-
`scalafix-data`(scala213, _.settings(scala213Settings).dependsOn(compat213JVM))
145+
val `scalafix-data213` = `scalafix-data`(scala213, _.dependsOn(compat213JVM))
155146

156147
lazy val `scalafix-input` = project
157148
.in(file("scalafix/input"))
@@ -204,14 +195,12 @@ lazy val `scalafix-output213` = `scalafix-output`(
204195
scala213,
205196
_.settings(addOutput213)
206197
.settings(addOutput212Plus)
207-
.settings(scala213Settings)
208198
.dependsOn(`scalafix-data213`)
209199
)
210200

211201
lazy val `scalafix-output213-failure` = project
212202
.in(file("scalafix/output213-failure"))
213203
.settings(sharedScalafixSettings)
214-
.settings(scala213Settings)
215204
.settings(dontPublish)
216205

217206
lazy val `scalafix-tests` = project
@@ -270,10 +259,6 @@ inThisBuild(releaseCredentials)
270259
inThisBuild(
271260
Seq(
272261
crossScalaVersions := Seq(scala211, scala212, scala213),
273-
commands += Command.command("latest-213") { state =>
274-
LatestScala.printLatestScala213()
275-
state
276-
},
277262
commands += Command.command(preRelease) { state =>
278263
// Show Compat version, Scala version, and Java Version
279264
val jvmVersion = Version.parse(sys.props("java.specification.version")).get.minor

project/LatestScala213.scala

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)