From 3effcd232f0e3be32a8ee8f7b9eda832639e4f21 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Fri, 12 Feb 2016 21:58:36 +1000
Subject: Update to partest 1.0.13

Which lets us remove the dependency on sbt-partest-interface,
as this has been incorporated into scala-partest itself.

Conflicts:
	scripts/jobs/integrate/bootstrap
---
 scripts/jobs/integrate/bootstrap | 14 --------------
 1 file changed, 14 deletions(-)
 mode change 100755 => 100644 scripts/jobs/integrate/bootstrap

(limited to 'scripts')

diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
old mode 100755
new mode 100644
index cbb8e1026b..a81c672d6e
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -238,15 +238,6 @@ buildPartest() {
   fi
 }
 
-# buildPartestIface() {
-#   if [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.modules"  "scala-partest-interface" $PARTEST_IFACE_VER )
-#   then echo "Found scala-partest-interface $PARTEST_IFACE_VER; not building."
-#   else
-#     update scala scala-partest-interface "$PARTEST_IFACE_REF" && gfxd
-#     sbtBuild 'set version :="'$PARTEST_IFACE_VER'"' $clean "${buildTasks[@]}"
-#   fi
-# }
-
 buildContinuations() {
   if [ "$CONT_PLUG_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.plugins"  "scala-continuations-plugin" $CONTINUATIONS_VER full )
   then echo "Found scala-continuations-plugin $CONTINUATIONS_VER; not building."
@@ -312,7 +303,6 @@ buildModules() {
   buildActorsMigration
   buildScalacheck
   buildPartest
-  # buildPartestIface
 }
 
 buildPublishedModules() {
@@ -324,7 +314,6 @@ buildPublishedModules() {
   buildSwing
   buildActorsMigration
   buildPartest
-  # buildPartestIface
 }
 
 
@@ -441,7 +430,6 @@ deriveModuleVersions() {
                 SWING_REF="v$SWING_VER"
      ACTORS_MIGRATION_REF="v$ACTORS_MIGRATION_VER"
               PARTEST_REF="v$PARTEST_VER"
-      # PARTEST_IFACE_REF="v$PARTEST_IFACE_VER"
            SCALACHECK_REF="$SCALACHECK_VER" # no `v` in their tags
    else
     # use HEAD as default when no revision is specified on the command line
@@ -451,7 +439,6 @@ deriveModuleVersions() {
                SWING_REF=${SWING_REF-"HEAD"}
     ACTORS_MIGRATION_REF=${ACTORS_MIGRATION_REF-"HEAD"}
              PARTEST_REF=${PARTEST_REF-"HEAD"}
-     # PARTEST_IFACE_REF=${PARTEST_IFACE_REF-"HEAD"}
           SCALACHECK_REF=${SCALACHECK_REF-"HEAD"}
 
                  XML_VER=$(deriveVersion scala scala-xml "$XML_REF")
@@ -472,7 +459,6 @@ deriveModuleVersions() {
   echo "SWING            = $SWING_VER at $SWING_REF"
   echo "XML              = $XML_VER at $XML_REF"
 
-  # PARTEST_IFACE_VER=${PARTEST_IFACE_VER-$(deriveVersion scala scala-partest-interface "$PARTEST_IFACE_REF")}
 }
 
 createNetrcFile() {
-- 
cgit v1.2.3