From 3eb2d66b0f64693a3b88bc91104820187accf7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Wed, 9 Oct 2024 09:57:08 +0100 Subject: [PATCH 1/2] reenable some tests --- main-settings/src/test/scala/sbt/AppendSpec.scala | 2 -- main-settings/src/test/scala/sbt/SlashSyntaxTest.scala | 3 +-- main-settings/src/test/scala/sbt/std/TaskPosSpec.scala | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/main-settings/src/test/scala/sbt/AppendSpec.scala b/main-settings/src/test/scala/sbt/AppendSpec.scala index 3bfe1aa9b..1b97b363b 100644 --- a/main-settings/src/test/scala/sbt/AppendSpec.scala +++ b/main-settings/src/test/scala/sbt/AppendSpec.scala @@ -5,7 +5,6 @@ * Copyright 2008 - 2010, Mark Harrah * Licensed under Apache License 2.0 (see LICENSE) */ -/* package sbt object AppendSpec { @@ -30,4 +29,3 @@ object AppendSpec { Global / onLoad += (() => doSideEffect()) Global / onLoad += (() => println("foo")) } - */ diff --git a/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala b/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala index 8daa451af..5aeec369d 100644 --- a/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala +++ b/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala @@ -5,7 +5,7 @@ * Copyright 2008 - 2010, Mark Harrah * Licensed under Apache License 2.0 (see LICENSE) */ -/* + package sbt.test import java.io.File @@ -63,4 +63,3 @@ object SlashSyntaxTest extends sbt.SlashSyntax { libraryDependencies += uTest % Test, ) } - */ diff --git a/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala b/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala index ef783dc01..6929b3105 100644 --- a/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala +++ b/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala @@ -5,7 +5,7 @@ * Copyright 2008 - 2010, Mark Harrah * Licensed under Apache License 2.0 (see LICENSE) */ -/* + package sbt.std class TaskPosSpec { @@ -205,4 +205,3 @@ class TaskPosSpec { withKey(bar) } } - */ From fe045bfa12079b52618c16405dbe3c45c89bd877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Wed, 9 Oct 2024 11:04:47 +0100 Subject: [PATCH 2/2] remove unused comment --- main-settings/src/test/scala/sbt/SlashSyntaxTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala b/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala index 5aeec369d..d14a46b0b 100644 --- a/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala +++ b/main-settings/src/test/scala/sbt/SlashSyntaxTest.scala @@ -9,7 +9,7 @@ package sbt.test import java.io.File -import sjsonnew._, BasicJsonProtocol._ +import sjsonnew._ import sbt.Def.{ Setting, inputKey, settingKey, taskKey } import sbt.Scope.Global import sbt.librarymanagement.ModuleID