From 04672d3118a5e1509db879b1c7812e60ff6e20c2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 19 Sep 2021 01:47:24 -0400 Subject: [PATCH] Mark failing scripted tests pending --- .../src/sbt-test/classloader-cache/spark/{test => disabled} | 0 sbt-app/src/sbt-test/compiler-project/run-test/build.sbt | 2 +- .../sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt | 2 +- .../dependency-graph/ignoreScalaLibrary/{test => pending} | 0 sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt | 2 +- .../sbt-test/dependency-graph/toFileSubTask/{test => pending} | 0 sbt-app/src/sbt-test/project/unified/build.sbt | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) rename sbt-app/src/sbt-test/classloader-cache/spark/{test => disabled} (100%) rename sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/{test => pending} (100%) rename sbt-app/src/sbt-test/dependency-graph/toFileSubTask/{test => pending} (100%) diff --git a/sbt-app/src/sbt-test/classloader-cache/spark/test b/sbt-app/src/sbt-test/classloader-cache/spark/disabled similarity index 100% rename from sbt-app/src/sbt-test/classloader-cache/spark/test rename to sbt-app/src/sbt-test/classloader-cache/spark/disabled diff --git a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt index af714fb9e..09ac3d406 100644 --- a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt @@ -1,4 +1,4 @@ -scalaVersion in ThisBuild := "2.12.3" +ThisBuild / scalaVersion := "2.12.15" libraryDependencies ++= Seq( "com.novocode" % "junit-interface" % "0.5" % Test, diff --git a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt index 7e9f4cce2..b2aec7b01 100644 --- a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.9.2" +ThisBuild / scalaVersion := "2.12.15" libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % "1.7.2", diff --git a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/test b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/test rename to sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/pending diff --git a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt index 6b66e7321..f830ec558 100644 --- a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt @@ -1,5 +1,5 @@ // ThisBuild / useCoursier := false -ThisBuild / scalaVersion := "2.12.6" +ThisBuild / scalaVersion := "2.12.15" ThisBuild / organization := "org.example" ThisBuild / version := "0.1" diff --git a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/test b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/pending similarity index 100% rename from sbt-app/src/sbt-test/dependency-graph/toFileSubTask/test rename to sbt-app/src/sbt-test/dependency-graph/toFileSubTask/pending diff --git a/sbt-app/src/sbt-test/project/unified/build.sbt b/sbt-app/src/sbt-test/project/unified/build.sbt index fd6471758..11d0eb84e 100644 --- a/sbt-app/src/sbt-test/project/unified/build.sbt +++ b/sbt-app/src/sbt-test/project/unified/build.sbt @@ -1,3 +1,5 @@ +ThisBuild / scalaVersion := "2.12.15" + import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed } import sbt.internal.Inspect import sjsonnew._, BasicJsonProtocol._ @@ -11,8 +13,6 @@ val buildInfo = taskKey[Seq[File]]("The task that generates the build info.") lazy val root = (project in file(".")) .settings( - Global / cancelable := true, - ThisBuild / scalaVersion := "2.12.3", console / scalacOptions += "-deprecation", Compile / console / scalacOptions += "-Ywarn-numeric-widen", projA / Compile / console / scalacOptions += "-feature",