Skip to content

Commit 9a24c0a

Browse files
committed
chore: drop the old sbt-test infrastructure
1 parent 26f7ebb commit 9a24c0a

File tree

3 files changed

+1
-43
lines changed

3 files changed

+1
-43
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ jobs:
450450
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
451451

452452
- name: Test sbt
453-
run: ./project/scripts/sbt "sbt-test/scripted; sbt-community-build/scripted"
453+
run: ./project/scripts/sbt sbt-community-build/scripted
454454

455455
publish_release:
456456
permissions:

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ val sjsSandbox = Build.sjsSandbox
5555
val sjsJUnitTests = Build.sjsJUnitTests
5656
val sjsCompilerTests = Build.sjsCompilerTests
5757

58-
val `sbt-test` = Build.`sbt-test`
5958
val `sbt-test-new` = Build.`sbt-test-new`
6059

6160
inThisBuild(Build.thisBuildSettings)

project/Build.scala

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,47 +3189,6 @@ object Build {
31893189
BuildInfoPlugin.buildInfoScopedSettings(Test),
31903190
)
31913191

3192-
// various scripted sbt tests
3193-
lazy val `sbt-test` = project.in(file("sbt-test")).
3194-
enablePlugins(ScriptedPlugin).
3195-
settings(commonSettings).
3196-
settings(
3197-
sbtTestDirectory := baseDirectory.value,
3198-
target := baseDirectory.value / ".." / "out" / name.value,
3199-
3200-
// The batch mode accidentally became the default with no way to disable
3201-
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
3202-
// We enable it explicitly here to make it clear that we're using it.
3203-
scriptedBatchExecution := true,
3204-
3205-
scriptedLaunchOpts ++= Seq(
3206-
"-Dplugin.version=" + version.value,
3207-
"-Dplugin.scalaVersion=" + dottyVersion,
3208-
"-Dplugin.scala2Version=" + stdlibVersion(Bootstrapped),
3209-
"-Dplugin.scalaJSVersion=" + scalaJSVersion,
3210-
"-Dsbt.boot.directory=" + ((ThisBuild / baseDirectory).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
3211-
),
3212-
// Pass along ivy home and repositories settings to sbt instances run from the tests
3213-
scriptedLaunchOpts ++= {
3214-
val repositoryPath = (io.Path.userHome / ".sbt" / "repositories").absolutePath
3215-
s"-Dsbt.repository.config=$repositoryPath" ::
3216-
ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList
3217-
},
3218-
scriptedBufferLog := true,
3219-
scripted := scripted.dependsOn(
3220-
(`scala3-sbt-bridge` / publishLocalBin),
3221-
(`scala3-interfaces` / publishLocalBin),
3222-
(`scala3-compiler-bootstrapped` / publishLocalBin),
3223-
(`scala3-library-bootstrapped` / publishLocalBin),
3224-
(`scala3-library-bootstrappedJS` / publishLocalBin),
3225-
(`tasty-core-bootstrapped` / publishLocalBin),
3226-
(`scala3-staging` / publishLocalBin),
3227-
(`scala3-tasty-inspector` / publishLocalBin),
3228-
(`scaladoc` / publishLocalBin),
3229-
(`scala3-bootstrapped` / publishLocalBin) // Needed because sbt currently hardcodes the dotty artifact
3230-
).evaluated
3231-
)
3232-
32333192
lazy val `sbt-community-build` = project.in(file("sbt-community-build")).
32343193
enablePlugins(SbtPlugin).
32353194
settings(commonSettings).

0 commit comments

Comments
 (0)