Skip to content

Commit 890c0ca

Browse files
committed
update testSamples build setting
1 parent 00603e6 commit 890c0ca

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value
2424

2525
lazy val root = (project in file("."))
2626
.enablePlugins(ShadingPlugin)
27-
.aggregate(launchInterfaceSub, launchSub)
27+
.aggregate(launchInterfaceSub, launchSub, testSamples)
2828
.settings(javaOnly ++ Util.commonSettings("launcher") ++ Release.settings)
2929
.settings(nocomma {
3030
mimaPreviousArtifacts := Set.empty
@@ -170,8 +170,10 @@ def ivyFilter = {
170170
lazy val testSamples = (project in file("test-sample"))
171171
.dependsOn(launchInterfaceSub)
172172
.settings(Release.javaVersionCheckSettings)
173+
.settings(Util.baseScalacOptions)
173174
.settings(nocomma {
174175
name := "Launch Test"
176+
mimaFailOnNoPrevious := false
175177
publish := { () }
176178
publishSigned := { () }
177179
libraryDependencies += scalaCompiler.value

test-sample/src/main/scala/xsbt/boot/test/Apps.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** These are packaged and published locally and the resulting artifact is used to test the launcher.*/
1+
/** These are packaged and published locally and the resulting artifact is used to test the launcher. */
22
package xsbt.boot.test
33

44
class Exit(val code: Int) extends xsbti.Exit
@@ -22,7 +22,7 @@ class AppVersionTest extends xsbti.AppMain {
2222
}
2323
}
2424
class ExtraTest extends xsbti.AppMain {
25-
def run(configuration: xsbti.AppConfiguration) = {
25+
def run(configuration: xsbti.AppConfiguration): xsbti.Exit = {
2626
configuration.arguments.foreach { arg =>
2727
if (getClass.getClassLoader.getResource(arg) eq null)
2828
throw new MainException("Could not find '" + arg + "'")
@@ -31,7 +31,7 @@ class ExtraTest extends xsbti.AppMain {
3131
}
3232
}
3333
class PriorityTest extends xsbti.AppMain {
34-
def run(configuration: xsbti.AppConfiguration) =
34+
def run(configuration: xsbti.AppConfiguration): xsbti.Exit =
3535
PriorityTest.run(configuration)
3636
}
3737
object PriorityTest {

test-sample/src/main/scala/xsbt/boot/test/Servers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** These are packaged and published locally and the resulting artifact is used to test the launcher.*/
1+
/** These are packaged and published locally and the resulting artifact is used to test the launcher. */
22
package xsbt.boot.test
33

44
import java.net.Socket
@@ -41,7 +41,7 @@ class EchoServer extends xsbti.ServerMain {
4141
// Lame way to break out.
4242
breakable {
4343
def read(): Unit = input.readLine match {
44-
case null => ()
44+
case null => ()
4545
case "kill" =>
4646
running.set(false)
4747
serverSocket.close()

0 commit comments

Comments
 (0)