Remove scripted references from io and util (which do not have scripted tests)

Author: Antonio Cunei

210.conf

@@ -5,7 +5,6 @@ vars.sbtBuild210: {
   space.to: ${vars.space-to-prefix}"sbt210"
   sbt-version: "1.0.1-toni1"
   extraction-version: ${vars.scala210-version}
-  sbt-commands: ${vars.sbt-commands}
 
   projects: [
     {

211.conf

@@ -5,7 +5,6 @@ vars.sbtBuild211: {
   space.to: ${vars.space-to-prefix}"sbt211"
   sbt-version: "1.0.1-toni1"
   extraction-version: ${vars.scala211-version}
-  sbt-commands: ${vars.sbt-commands}
 
   projects: [
     {

212.conf

@@ -5,7 +5,6 @@ vars.sbtBuild212: {
   space.to: ${vars.space-to-prefix}"sbt212"
   sbt-version: "1.0.1-toni1"
   extraction-version: ${vars.scala212-version}
-  sbt-commands: ${vars.sbt-commands}
 
   projects: [
     {

sbtcommunity.dbuild

@@ -16,8 +16,6 @@ build: {
   space.from: default
   space.to: ""
   extraction-version: ${vars.scala212-version}
-  sbt-commands: [ "set scriptedLaunchOpts ++= Seq(\"-Dsbt.override.build.repos=true\", (\"-Dsbt.repository.config=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/repositories\"), (\"-Dsbt.ivy.home=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/ivy2\"))",
-                  "set bintrayRelease in root := ()" ]
 
   projects: [
     {
@@ -32,15 +30,17 @@ build: {
       uri: "https://github.com/sbt/sbt-bintray.git#"${vars.sbtbintray}
       extra.test-tasks: [ test, scripted ]
       extra.skip-missing-tests: true
-      extra.commands: [ "set sbtVersion in pluginCrossBuild := \""${FRESHSBTVERSION}"\"" ]
+      extra.commands: [ "set scriptedLaunchOpts ++= Seq(\"-Dsbt.override.build.repos=true\", (\"-Dsbt.repository.config=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/repositories\"), (\"-Dsbt.ivy.home=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/ivy2\"))",
+                        "set bintrayRelease in root := ()",
+                        "set sbtVersion in pluginCrossBuild := \""${FRESHSBTVERSION}"\"" ]
     }
   ]
 }
 
 options.resolvers: {
   "R0000" : "local"
-  "R0001" : "sbt-snapshots: file:///localhome/jenkinssbt/sbt-snapshots"
-# "R0001" : "sbt-snapshots: file:///home/cunei/activities/clones/sbt-standalone-build/sbt-snapshots"
+# "R0001" : "sbt-snapshots: file:///localhome/jenkinssbt/sbt-snapshots"
+  "R0001" : "sbt-snapshots: file:///home/cunei/activities/clones/sbt-standalone-build/sbt-snapshots"
   "R0002" : "proxy-ch-maven: https://proxy-ch.typesafe.com:8082/artifactory/repo"
   "R0003" : "proxy-ch-ivy: https://proxy-ch.typesafe.com:8082/artifactory/repo, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]"
   "R0004" : "sbt-toni: https://dl.bintray.com/cunei/sbt-temp/"

validator.dbuild

@@ -24,9 +24,6 @@ vars: {
   scala210-version: ${vars.scala210-bin-version}".6"
 
   // propagate resolvers to the scripted tests
-  sbt-commands: [ "set scriptedLaunchOpts ++= Seq(\"-Dsbt.override.build.repos=true\", (\"-Dsbt.repository.config=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/repositories\"), (\"-Dsbt.ivy.home=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/ivy2\"))",
-                  "set bintrayRelease in root := ()" ]
-
   // if $SPACE_PREFIX is undefined, or "", then dbuild will compile
   // all subprojects on top of each other. If it is anything else,
   // each subproject's artifacts will end up in a dummy space, therefore
@@ -40,31 +37,37 @@ vars: {
     set-version-suffix: "bin-"${TIMESTAMP}
     extra.skip-missing-tests: true
     extra.test-tasks: [ test ]
-//    extra.test-tasks: [ test, scripted ]
+//    extra.test-tasks: [ test, scripted ]  // scripted testing too complex in sbt/sbt for dbuild
+    extra.commands: [ "set scriptedLaunchOpts ++= Seq(\"-Dsbt.override.build.repos=true\", (\"-Dsbt.repository.config=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/repositories\"), (\"-Dsbt.ivy.home=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/ivy2\"))",
+                      "set bintrayRelease in root := ()",
     // restore sbt-launch to the standard publish task
-    extra.commands: [ "project bundledLauncherProj","set publish := sbt.Classpaths.publishTask(publishConfiguration, deliver).value" ]
+                      "project bundledLauncherProj","set publish := sbt.Classpaths.publishTask(publishConfiguration, deliver).value" ]
   }
   zinc: {
     uri:    "https://github.com/sbt/zinc.git#"${zinc}
     set-version-suffix: "bin-"${TIMESTAMP}
+    extra.commands: [ "set scriptedLaunchOpts ++= Seq(\"-Dsbt.override.build.repos=true\", (\"-Dsbt.repository.config=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/repositories\"), (\"-Dsbt.ivy.home=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/ivy2\"))",
+                      "set bintrayRelease in root := ()" ]
     extra.test-tasks: [ test, scripted ]
     extra.run-tests: false
   }
   io: {
     uri:    "https://github.com/sbt/io.git#"${io}
     set-version-suffix: "bin-"${TIMESTAMP}
-    extra.test-tasks: [ test, scripted ]
+    extra.test-tasks: [ test ] // there are no scripted tests in sbt/io
     extra.skip-missing-tests: true
   }
   util: {
     uri:    "https://github.com/sbt/util.git#"${util}
     set-version-suffix: "bin-"${TIMESTAMP}
-    extra.test-tasks: [ test, scripted ]
+    extra.test-tasks: [ test ] // there are no scripted tests in sbt/util
     extra.skip-missing-tests: true
   }
   lib: {
     uri:    "https://github.com/sbt/librarymanagement.git#"${librarymanagement}
     set-version-suffix: "bin-"${TIMESTAMP}
+    extra.commands: [ "set scriptedLaunchOpts ++= Seq(\"-Dsbt.override.build.repos=true\", (\"-Dsbt.repository.config=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/repositories\"), (\"-Dsbt.ivy.home=\"+(baseDirectory.value.getAbsolutePath())+\"/.dbuild/ivy2\"))",
+                      "set bintrayRelease in root := ()" ]
     extra.test-tasks: [ test, scripted ]
     extra.skip-missing-tests: true
   }