Remove scala.actors and the actors migration module dependency

Author: lrytz

build-ant-macros.xml

@@ -126,7 +126,7 @@
     <attribute name="stage"/>
     <!-- current stage (locker, quick, strap) -->
     <attribute name="project"/>
-    <!-- project: library/reflect/compiler/actors -->
+    <!-- project: library/reflect/compiler -->
     <attribute name="destproject" default="@{project}"/>
     <!-- overrides the output directory; used when building multiple projects into the same directory-->
     <attribute name="args" default=""/>
@@ -193,7 +193,7 @@
     <attribute name="stage"/>
     <!-- current stage (locker, quick, strap) -->
     <attribute name="project"/>
-    <!-- project: library/reflect/compiler/actors -->
+    <!-- project: library/reflect/compiler -->
     <attribute name="srcpath" default="NOT SET"/>
     <!-- needed to compile the library -->
     <attribute name="args" default=""/>
@@ -262,7 +262,7 @@
     <attribute name="stage"/>
     <!-- current stage (locker, quick, strap) -->
     <attribute name="project"/>
-    <!-- project: library/reflect/compiler/actors -->
+    <!-- project: library/reflect/compiler -->
     <attribute name="srcpath" default="NOT SET"/>
     <!-- needed to compile the library -->
     <attribute name="args" default=""/>
@@ -598,7 +598,6 @@
           <filter token="SNAPSHOT_REPOSITORY"        value="${remote.snapshot.repository}" />
           <filter token="JLINE_VERSION"              value="${jline.version}" />
           <filter token="AKKA_ACTOR_VERSION"         value="${akka-actor.version.number}" />
-          <filter token="ACTORS_MIGRATION_VERSION"   value="${actors-migration.version.number}" />
 
           <!-- TODO modularize compiler.
           <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}" />
@@ -737,7 +736,6 @@
       <deploy-one name="scala-compiler-interactive" local="@{local}" signed="@{signed}"/>
       -->
 
-      <deploy-one name="scala-actors"      local="@{local}" signed="@{signed}"/>
       <deploy-one name="scalap"            local="@{local}" signed="@{signed}"/>
     </sequential>
   </macrodef>

build.xml

@@ -75,8 +75,8 @@ TODO:
   <target name="nightly"><optimized name="all.done"/></target>
   <target name="nightly.checkall"> <antcall target="all.done"> <param name="partest.scalac_opts" value="-Ycheck:all"/></antcall></target>
 
-  <!-- The IDE build requires actors/swing, so need to publish them during PR validation until they are modules -->
-  <target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/actors/swing).">
+  <!-- The IDE build requires swing, so need to publish them during PR validation until they are modules -->
+  <target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/swing).">
     <antcall target="publish">
       <param name="docs.skip" value="1"/>
       <param name="scalac.args.optimise" value="-optimise"/>
@@ -556,7 +556,6 @@ TODO:
       <echo message="scala-parser-combinators.version.number    = ${scala-parser-combinators.version.number}"/>
       <echo message="scala-swing.version.number                 = ${scala-swing.version.number}"/>
       <echo message="akka-actor.version.number                  = ${akka-actor.version.number}"/>
-      <echo message="actors-migration.version.number            = ${actors-migration.version.number}"/>
       <echo message="jline.version                              = ${jline.version}"/>
       <echo message="partest.version.number                     = ${partest.version.number}"/>
       <echo message="scalacheck.version.number                  = ${scalacheck.version.number}"/>
@@ -568,7 +567,6 @@ TODO:
         <entry key="scala-parser-combinators.version.number"    value="${scala-parser-combinators.version.number}"/>
         <entry key="scala-swing.version.number"                 value="${scala-swing.version.number}"/>
         <entry key="akka-actor.version.number"                  value="${akka-actor.version.number}"/>
-        <entry key="actors-migration.version.number"            value="${actors-migration.version.number}"/>
         <entry key="jline.version"                              value="${jline.version}"/>
         <entry key="partest.version.number"                     value="${partest.version.number}"/>
         <entry key="scalacheck.version.number"                  value="${scalacheck.version.number}"/>
@@ -606,8 +604,6 @@ TODO:
     <property name="scaladoc.version"              value="${scala-compiler-doc.version.number}"/>
     <property name="scaladoc.targetjar"            value="scala-compiler-doc_${scala.binary.version}-${scala-compiler-doc.version.number}.jar"/>
 
-    <property name="actors.description"            value="Scala Actors Library"/>
-
     <property name="swing.description"             value="Scala Swing Library"/>
     <property name="swing.package"                 value="modules."/>
     <property name="swing.jar"                     value="${scala-swing}"/>
@@ -634,7 +630,7 @@ TODO:
     <property name="partest-javaagent.description" value="Scala Compiler Testing Tool (compiler-specific java agent)"/>
 
     <!-- projects without project-specific options: asm, forkjoin, manual, bin, repl -->
-    <for list="actors,compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml" param="project">
+    <for list="compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml" param="project">
       <sequential>
         <!-- description is mandatory -->
         <init-project-prop project="@{project}" name="package"     default=""/> <!-- used by mvn-package, copy-bundle, make-bundle -->
@@ -683,7 +679,7 @@ TODO:
       There must be a variable of the shape @{stage}.@{project}.build.path
       for all @{stage} in locker, quick, strap
       and all @{project} in library, reflect, compiler
-        when stage is quick, @{project} also includes: actors, repl, scalap
+        when stage is quick, @{project} also includes: repl, scalap
 
       NOTE: interactive, scaladoc, are only used upto quick; they are still packed into the compiler jar
     -->
@@ -716,11 +712,6 @@ TODO:
       <path refid="aux.libs"/>
     </path>
 
-    <path id="quick.actors.build.path">
-      <path refid="quick.library.build.path"/>
-      <pathelement location="${build-quick.dir}/classes/actors"/>
-    </path>
-
     <path id="quick.reflect.build.path">
       <path refid="quick.library.build.path"/>
       <pathelement location="${build-quick.dir}/classes/reflect"/>
@@ -770,7 +761,6 @@ TODO:
 
     <path id="quick.bin.tool.path">
       <path refid="quick.repl.build.path"/>
-      <path refid="quick.actors.build.path"/>
       <pathelement location="${build-quick.dir}/classes/scalap"/>
       <pathelement location="${build-quick.dir}/classes/scaladoc"/>
       <path refid="external-modules-nocore"/>
@@ -790,7 +780,6 @@ TODO:
       <pathelement location="${library.jar}"/>
       <pathelement location="${xml.jar}"/>
       <pathelement location="${parser-combinators.jar}"/>
-      <pathelement location="${actors.jar}"/>
       <pathelement location="${reflect.jar}"/>
       <pathelement location="${compiler.jar}"/>
       <!-- TODO modularize compiler: <pathelement location="${scaladoc.jar}"/> -->
@@ -804,10 +793,6 @@ TODO:
       <fileset dir="${forkjoin-classes}"/>
     </path>
 
-    <path id="pack.actors.files">
-      <fileset dir="${build-quick.dir}/classes/actors"/>
-    </path>
-
     <path id="pack.compiler.files">
       <fileset dir="${build-quick.dir}/classes/compiler"/>
 
@@ -854,7 +839,6 @@ TODO:
     <path id="docs.scaladoc.build.path">              <path refid="quick.scaladoc.build.path"/> </path>
     <path id="docs.interactive.build.path">           <path refid="quick.interactive.build.path"/> </path>
     <path id="docs.scalap.build.path">                <path refid="quick.scalap.build.path"/>   </path>
-    <path id="docs.actors.build.path">                <path refid="quick.actors.build.path"/>   </path>
 
     <!-- run-time classpath for scaladoc TODO: resolve through maven -->
     <path id="scaladoc.classpath">
@@ -910,9 +894,8 @@ TODO:
       <pathelement location="${interactive.jar}"/>
       -->
 
-      <!-- TODO: move scalap & actors out of repo -->
+      <!-- TODO: move scalap out of repo -->
       <pathelement location="${scalap.jar}"/>
-      <pathelement location="${actors.jar}"/>
 
       <!-- partest's dependencies, which marks most of its dependencies as provided,
            (but not scala-library, so we filter that one out...)
@@ -935,7 +918,6 @@ TODO:
           <rsel:name name="scala-library*.jar"/>
           <rsel:name name="scala-compiler*.jar"/>
           <rsel:name name="scala-reflect*.jar"/>
-          <rsel:name name="scala-actors*.jar"/>
           <rsel:name name="scala-parser-combinators*.jar"/>
           <rsel:name name="scala-xml*.jar"/>
         </rsel:or></rsel:not>
@@ -963,7 +945,6 @@ TODO:
       <pathelement location="${build-osgi.dir}/org.scala-lang.scala-library.jar"/>
       <pathelement location="${build-osgi.dir}/org.scala-lang.scala-reflect.jar"/>
       <pathelement location="${build-osgi.dir}/org.scala-lang.scala-compiler.jar"/>
-      <pathelement location="${build-osgi.dir}/org.scala-lang.scala-actors.jar"/>
       <path refid="pax.exam.classpath"/>
       <path refid="forkjoin.classpath"/>
     </path>
@@ -1103,9 +1084,6 @@ TODO:
   <target name="quick.scalap"     depends="quick.repl">
     <staged-build with="locker"   stage="quick" project="scalap"/> </target>
 
-  <target name="quick.actors"     depends="quick.lib">
-    <staged-build with="locker"   stage="quick" project="actors"/> </target>
-
 
 
   <target name="quick.modules" depends="quick.repl, quick.scaladoc, quick.interactive, quick.scalap"/>
@@ -1157,14 +1135,12 @@ TODO:
   <target name="pack.interactive" depends="quick.interactive"> <staged-pack project="interactive"/> </target>
   -->
 
-  <target name="pack.actors" depends="quick.actors"> <staged-pack project="actors"/> </target>
-
   <target name="pack.scalap"     depends="quick.scalap">     <staged-pack project="scalap"/> </target>
 
   <target name="pack.core" depends="pack.reflect, pack.comp, pack.lib"/>
 
   <!-- TODO modularize compiler: pack.scaladoc, pack.interactive, -->
-  <target name="pack.modules" depends="pack.actors, pack.scalap">
+  <target name="pack.modules" depends="pack.scalap">
     <copy todir="${build-pack.dir}/lib">
       <path refid="external-modules-nocore" />
       <mapper type="flatten" />
@@ -1270,8 +1246,6 @@ TODO:
             <include name="${scaladoc.jar}"/>
             -->
 
-          <file name="${actors.jar}"/>
-
           <file name="${parser-combinators.jar}"/>
           <file name="${xml.jar}"/>
           <file name="${swing.jar}"/>
@@ -1296,11 +1270,6 @@ TODO:
       </make-bundle>
       -->
 
-      <make-bundle project="actors">
-        <fileset dir="${src.dir}/actors"/>
-      </make-bundle>
-
-
       <make-bundle project="parser-combinators"/>
       <make-bundle project="xml"/>
       <make-bundle project="swing"/>
@@ -1611,12 +1580,6 @@ TODO:
   </target>
   -->
 
-  <target name="docs.actors" depends="docs.start" unless="docs.skip">
-    <staged-docs project="actors">
-      <include name="**/*.scala"/>
-    </staged-docs>
-  </target>
-
   <target name="docs.scalap" depends="docs.start" unless="docs.skip">
     <staged-docs project="scalap">
       <include name="**/*.scala"/>
@@ -1625,7 +1588,7 @@ TODO:
 
   <target name="docs.core" depends="docs.lib, docs.reflect, docs.comp" unless="docs.skip"/>
   <!-- TODO modularize compiler:  docs.scaladoc, docs.interactive, -->
-  <target name="docs.done" depends="docs.core, docs.actors, docs.scalap" unless="docs.skip"/>
+  <target name="docs.done" depends="docs.core, docs.scalap" unless="docs.skip"/>
 
   <!-- doc/ and man/ -->
   <target name="pack.doc" depends="scaladoc.task" unless="docs.skip"> <!-- depends on scaladoc.task for scalac taskdef -->
@@ -1700,8 +1663,6 @@ MAIN DISTRIBUTION PACKAGING
     <mvn-package project="scaladoc"/>
     -->
 
-    <mvn-package project="actors"/>
-
     <!-- don't bother fitting scalap into the mould: it will move out soon -->
     <copy tofile="${dist.maven}/scalap/scalap-pom.xml" file="${src.dir}/build/maven/scalap-pom.xml" overwrite="true"/>
     <copy tofile="${dist.maven}/scalap/scalap.jar" file="${scalap.jar}" overwrite="true"/>

scripts/jobs/integrate/bootstrap

@@ -256,18 +256,6 @@ buildSwing() {
   fi
 }
 
-buildActorsMigration(){
-  if [ "$ACTORS_MIGRATION_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang"  "scala-actors-migration" $ACTORS_MIGRATION_VER )
-  then echo "Found scala-actors-migration $ACTORS_MIGRATION_VER; not building."
-  else
-    update scala actors-migration "$ACTORS_MIGRATION_REF" && gfxd
-    # not running tests because
-    # [error] Test scala.actors.migration.NestedReact.testNestedReactAkka failed: java.util.concurrent.TimeoutException: Futures timed out after [20 seconds]
-    sbtBuild 'set version := "'$ACTORS_MIGRATION_VER'"' $clean "${buildTasks[@]}"
-    ACTORS_MIGRATION_BUILT="yes"
-  fi
-}
-
 buildScalacheck(){
   if [ "$SCALACHECK_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scalacheck"  "scalacheck" $SCALACHECK_VER )
   then echo "Found scalacheck $SCALACHECK_VER; not building."
@@ -283,7 +271,6 @@ buildModules() {
   buildXML
   buildParsers
   buildSwing
-  buildActorsMigration
   buildScalacheck
   buildPartest
   # buildPartestIface
@@ -365,37 +352,32 @@ deriveModuleVersions() {
                   XML_VER=${XML_VER-$scala_xml_version_number}
               PARSERS_VER=${PARSERS_VER-$scala_parser_combinators_version_number}
                 SWING_VER=${SWING_VER-$scala_swing_version_number}
-     ACTORS_MIGRATION_VER=${ACTORS_MIGRATION_VER-$actors_migration_version_number}
               PARTEST_VER=${PARTEST_VER-$partest_version_number}
            SCALACHECK_VER=${SCALACHECK_VER-$scalacheck_version_number}
 
      # If a _VER was not specified, the corresponding _REF will be non-empty by now (as specified, or HEAD)
                   XML_REF=${XML_REF-"v$XML_VER"}
               PARSERS_REF=${PARSERS_REF-"v$PARSERS_VER"}
                 SWING_REF=${SWING_REF-"v$SWING_VER"}
-     ACTORS_MIGRATION_REF=${ACTORS_MIGRATION_REF-"v$ACTORS_MIGRATION_VER"}
               PARTEST_REF=${PARTEST_REF-"v$PARTEST_VER"}
         # PARTEST_IFACE_REF=${PARTEST_IFACE_REF-"v$PARTEST_IFACE_VER"}
            SCALACHECK_REF=${SCALACHECK_REF-"$SCALACHECK_VER"}
    else
                  XML_VER=${XML_VER-$(deriveVersion scala scala-xml "$XML_REF")}
              PARSERS_VER=${PARSERS_VER-$(deriveVersion scala scala-parser-combinators "$PARSERS_REF")}
                SWING_VER=${SWING_VER-$(deriveVersion scala scala-swing "$SWING_REF")}
-    ACTORS_MIGRATION_VER=${ACTORS_MIGRATION_VER-$(deriveVersion scala actors-migration "$ACTORS_MIGRATION_REF")}
              PARTEST_VER=${PARTEST_VER-$(deriveVersion scala scala-partest "$PARTEST_REF")}
           SCALACHECK_VER=${SCALACHECK_VER-$(deriveVersionAnyTag rickynils scalacheck "$SCALACHECK_REF")}
 
                  XML_REF=${XML_REF-"HEAD"}
              PARSERS_REF=${PARSERS_REF-"HEAD"}
                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"}
   fi
 
   echo "Module versions (versioning strategy: $moduleVersioning):"
-  echo "ACTORS_MIGRATION = $ACTORS_MIGRATION_VER at $ACTORS_MIGRATION_REF"
   echo "PARSERS          = $PARSERS_VER at $PARSERS_REF"
   echo "PARTEST          = $PARTEST_VER at $PARTEST_REF"
   echo "SCALACHECK       = $SCALACHECK_VER at $SCALACHECK_REF"
@@ -411,7 +393,6 @@ constructUpdatedModuleVersions() {
   # force the new module versions for building the core. these may be different from the values in versions.properties,
   # either because the variables (XML_VER) were provided, or because we're building the modules from HEAD.
   # in the common case, the values are the same as in versions.properties.
-  updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dactors-migration.version.number=$ACTORS_MIGRATION_VER")
   updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-parser-combinators.version.number=$PARSERS_VER")
   updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-swing.version.number=$SWING_VER")
   updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-xml.version.number=$XML_VER")