Skip to content

Commit

Permalink
Remove sbt 0.13 cross build
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Dec 11, 2023
1 parent cad9db4 commit 5b848dc
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 51 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ target/
.classpath
.settings/
.project
.bsp/
12 changes: 2 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
lazy val `sbt-multi-jvm` = project in file(".")

crossScalaVersions := Seq("2.12.17", "2.10.7")
crossScalaVersions := Seq("2.12.18")
organization := "com.github.sbt"
name := "sbt-multi-jvm"
enablePlugins(SbtPlugin)
pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.10" => "0.13.18"
case "2.12" => "1.2.8" // set minimum sbt version
case "2.12" => "1.9.7" // set minimum sbt version
}
}

Expand All @@ -26,12 +25,5 @@ scalacOptions ++= List(
"-encoding", "UTF-8"
)

scalacOptions ++= {
if((pluginCrossBuild / sbtVersion).value.startsWith("0.13"))
Seq("-target:jvm-1.6")
else
Nil
}

// publish settings
licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.3
sbt.version=1.9.7
Empty file removed project/plugins.sbt
Empty file.
22 changes: 0 additions & 22 deletions src/main/scala-sbt-0.13/com/typesafe/sbt/multijvm/Compat.scala

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/scala-sbt-1.0/com/typesafe/sbt/multijvm/Compat.scala

This file was deleted.

10 changes: 5 additions & 5 deletions src/main/scala/com/typesafe/sbt/SbtMultiJvm.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
package com.typesafe.sbt

import com.typesafe.sbt.multijvm.{Jvm, JvmLogger}
import com.typesafe.sbt.multijvm.Compat.{Process, _}
import com.typesafe.sbt.multijvm.Compat.Implicits._
import sbt._
import Keys._
import java.io.File
import java.lang.Boolean.getBoolean

import scala.Console.{ GREEN, RESET }
import scala.sys.process.Process

import sbtassembly.AssemblyPlugin.assemblySettings
import sbtassembly.{MergeStrategy, AssemblyKeys}
import sjsonnew.BasicJsonProtocol._
import AssemblyKeys._

object MultiJvmPlugin extends AutoPlugin {
Expand Down Expand Up @@ -258,7 +258,7 @@ object MultiJvmPlugin extends AutoPlugin {
}

def multi(name: String, classes: Seq[String], marker: String, javaBin: File, options: Options, srcDir: File,
input: Boolean, createLogger: String => Logger, log: Logger): (String, TestResultValue) = {
input: Boolean, createLogger: String => Logger, log: Logger): (String, TestResult) = {
val logName = "* " + name
log.info(if (log.ansiCodesSupported) GREEN + logName + RESET else logName)
val classesHostsJavas = getClassesHostsJavas(classes, IndexedSeq.empty, IndexedSeq.empty, "")
Expand All @@ -281,7 +281,7 @@ object MultiJvmPlugin extends AutoPlugin {
processExitCodes(name, processes, log)
}

def processExitCodes(name: String, processes: Seq[(String, Process)], log: Logger): (String, TestResultValue) = {
def processExitCodes(name: String, processes: Seq[(String, Process)], log: Logger): (String, TestResult) = {
val exitCodes = processes map {
case (testClass, process) => (testClass, process.exitValue())
}
Expand Down Expand Up @@ -330,7 +330,7 @@ object MultiJvmPlugin extends AutoPlugin {

def multiNode(name: String, classes: Seq[String], marker: String, defaultJava: String, options: Options, srcDir: File,
input: Boolean, testJar: String, hostsAndUsers: IndexedSeq[String], javas: IndexedSeq[String], targetDir: String,
createLogger: String => Logger, log: Logger): (String, TestResultValue) = {
createLogger: String => Logger, log: Logger): (String, TestResult) = {
val logName = "* " + name
log.info(if (log.ansiCodesSupported) GREEN + logName + RESET else logName)
val classesHostsJavas = getClassesHostsJavas(classes, hostsAndUsers, javas, defaultJava)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/multijvm/Jvm.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import java.io.File
import java.lang.{ProcessBuilder => JProcessBuilder}

import sbt._
import com.typesafe.sbt.multijvm.Compat.{Process, _}
import scala.sys.process.Process

object Jvm {
def startJvm(javaBin: File, jvmOptions: Seq[String], runOptions: Seq[String], logger: Logger, connectInput: Boolean) = {
Expand Down

0 comments on commit 5b848dc

Please sign in to comment.