WIP move module-var and -accessor synthesis out of mixin

README.md

@@ -64,7 +64,7 @@ scala/
 
 ## Requirements
 
-You'll need a Java SDK (6 or newer), Apache Ant (version 1.8.0 or above), and curl (for `./pull-binary-libs.sh`).
+You'll need a Java SDK (8 or newer), Apache Ant (version 1.9.3 or above), and curl (for `./pull-binary-libs.sh`).
 
 ## Git Hygiene
 
@@ -180,7 +180,7 @@ We typically alias `build/quick/bin/scalac -d sandbox` to `qsc` and `build/quick
 Note: on most machines this requires more heap than is allocate by default.  You can adjust the parameters with ANT_OPTS. Example command line:
 
 ```
-ANT_OPTS = "-Xms512M -Xmx2048M -Xss1M -XX:MaxPermSize=128M" ant docs
+ANT_OPTS = "-Xms512M -Xmx2048M -Xss1M" ant docs
 ```
 
   - `ant dist` builds a distribution in 'dists/latest'.

bincompat-backward.whitelist.conf

@@ -186,6 +186,15 @@ filter {
         matchName="scala.reflect.runtime.SynchronizedOps.newNestedScope"
         problemName=MissingMethodProblem
     },
+    // see github.com/scala/scala/pull/3925, SI-8627, SI-6440
+    {
+        matchName="scala.collection.TraversableLike.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stream.filteredTail"
+        problemName=MissingMethodProblem
+    },
     // https://github.com/scala/scala/pull/3848 -- SI-8680
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"

bincompat-forward.whitelist.conf

@@ -272,6 +272,103 @@ filter {
         matchName="scala.reflect.api.PredefTypeCreator"
         problemName=MissingClassProblem
     },
+    // see github.com/scala/scala/pull/3925, SI-8627, SI-6440
+    {
+        matchName="scala.collection.IterableViewLike#AbstractTransformed.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.AbstractTraversable.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.TraversableViewLike#AbstractTransformed.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.TraversableLike.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.SeqViewLike#AbstractTransformed.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.TreeSet.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stream.filteredTail"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stream.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stream.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.StringOps.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.TreeMap.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.concurrent.TrieMap.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofByte.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofLong.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofUnit.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofInt.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofChar.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofRef.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofDouble.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofFloat.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofBoolean.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayOps#ofShort.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.collection.mutable.TreeSet.filterImpl"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.io.AbstractFile.filterImpl"
+        problemName=MissingMethodProblem
+    },
     // https://github.com/scala/scala/pull/3848 -- SI-8680
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"

build-ant-macros.xml

@@ -6,7 +6,7 @@
     <attribute name="name"/>
     <sequential>
       <antcall target="@{name}">
-        <param name="scalac.args.optimise" value="-optimise"/>
+        <param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
       </antcall>
     </sequential>
   </macrodef>
@@ -91,7 +91,6 @@
 
   <macrodef name="simple-javac">
     <attribute name="project"/>
-    <!-- project: forkjoin -->
     <attribute name="args" default=""/>
     <attribute name="jar" default="yes"/>
     <sequential>
@@ -105,7 +104,7 @@
         <then>
           <stopwatch name="@{project}.timer"/>
           <mkdir dir="${@{project}-classes}"/>
-          <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${@{project}-classes}" classpath="${@{project}-classes}" includes="**/*.java" target="1.6" source="1.5" compiler="javac1.6">
+          <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${@{project}-classes}" classpath="${@{project}-classes}" includes="**/*.java" target="1.8" source="1.8" compiler="javac1.8">
             <compilerarg line="${javac.args} @{args}"/>
           </javac>
           <if>
@@ -126,13 +125,13 @@
     <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=""/>
     <attribute name="excludes" default=""/>
     <sequential>
-      <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${build-@{stage}.dir}/classes/@{destproject}" includes="**/*.java" excludes="@{excludes}" target="1.6" source="1.5">
+      <javac debug="true" srcdir="${src.dir}/@{project}" destdir="${build-@{stage}.dir}/classes/@{destproject}" includes="**/*.java" excludes="@{excludes}" target="1.8" source="1.8">
         <compilerarg line="${javac.args} @{args}"/>
         <classpath refid="@{stage}.@{destproject}.build.path"/>
       </javac>
@@ -193,7 +192,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=""/>
@@ -202,7 +201,9 @@
     <!-- overrides the output directory; used when building multiple projects into the same directory-->
     <attribute name="srcdir" default="@{project}"/>
     <attribute name="java-excludes" default=""/>
+    <attribute name="mixed" default="NOPE"/>
     <sequential>
+      <local name="mixed.true"/><condition property="mixed.true"><equals arg1="@{mixed}" arg2="true"/></condition>
       <!-- TODO: detect zinc anywhere on PATH
            use zinc for the quick stage if it's available;
            would use it for locker but something is iffy in sbt: get a class cast error on global phase -->
@@ -220,12 +221,14 @@
             <then>
               <scalacfork taskname="@{stage}.@{project}" jvmargs="${scalacfork.jvmargs}" compilerpathref="@{with}.compiler.path" destdir="${build-@{stage}.dir}/classes/@{destproject}" srcdir="${src.dir}/@{srcdir}" params="${scalac.args.@{stage}} @{args}">
                 <include name="**/*.scala"/>
+                <include name="**/*.java" if="mixed.true"/>
                 <compilationpath refid="@{stage}.@{project}.build.path"/>
               </scalacfork>
             </then>
             <else>
               <scalacfork taskname="@{stage}.@{project}" jvmargs="${scalacfork.jvmargs}" compilerpathref="@{with}.compiler.path" destdir="${build-@{stage}.dir}/classes/@{destproject}" srcdir="${src.dir}/@{srcdir}" srcpath="@{srcpath}" params="${scalac.args.@{stage}} @{args}">
                 <include name="**/*.scala"/>
+                <include name="**/*.java" if="mixed.true"/>
                 <compilationpath refid="@{stage}.@{project}.build.path"/>
               </scalacfork>
             </else>
@@ -262,14 +265,15 @@
     <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=""/>
     <!-- additional args -->
     <attribute name="includes" default="comp.includes"/>
     <attribute name="java-excludes" default=""/>
     <attribute name="version" default=""/>
+    <attribute name="mixed" default="NOPE"/>
     <!-- non-empty for scaladoc: use @{version}.version.number in property file-->
     <sequential>
       <staged-uptodate stage="@{stage}" project="@{project}">
@@ -279,9 +283,18 @@
         <do>
           <stopwatch name="@{stage}.@{project}.timer"/>
           <mkdir dir="${build-@{stage}.dir}/classes/@{project}"/>
-          <staged-javac stage="@{stage}" project="@{project}" excludes="@{java-excludes}"/>
-          <!-- always compile with javac for simplicity and regularity; it's cheap -->
-          <staged-scalac with="@{with}" stage="@{stage}" project="@{project}" srcpath="@{srcpath}" args="@{args}" java-excludes="@{java-excludes}"/>
+          <if>
+            <equals arg1="@{mixed}" arg2="true"/>
+            <then>
+              <staged-scalac with="@{with}" stage="@{stage}" project="@{project}" srcpath="@{srcpath}" args="@{args}" java-excludes="@{java-excludes}" mixed="@{mixed}"/>
+              <staged-javac stage="@{stage}" project="@{project}" excludes="@{java-excludes}"/>
+            </then>
+            <else>
+              <staged-javac stage="@{stage}" project="@{project}" excludes="@{java-excludes}"/>
+              <!-- always compile with javac for simplicity and regularity; it's cheap -->
+              <staged-scalac with="@{with}" stage="@{stage}" project="@{project}" srcpath="@{srcpath}" args="@{args}" java-excludes="@{java-excludes}"/>
+            </else>
+          </if>
           <if>
             <equals arg1="@{version}" arg2=""/>
             <then>
@@ -474,9 +487,8 @@
           <filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}"/>
           <filter token="XML_VERSION"                value="${scala-xml.version.number}" />
           <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
-          <filter token="CONTINUATIONS_PLUGIN_VERSION"  value="${scala-continuations-plugin.version.number}" />
-          <filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
-          <filter token="SCALA_SWING_VERSION"           value="${scala-swing.version.number}" />
+          <filter token="SCALA_SWING_VERSION"        value="${scala-swing.version.osgi}" />
+          <filter token="SOURCE_JARNAME"             value="${@{project}.targetjar}"/>
         </filterset>
       </copy>
       <bnd classpath="${@{project}.jar}" eclipse="false" failok="false" exceptions="true" files="${build-osgi.dir}/${@{project}.name}.bnd" output="${build-osgi.dir}"/>
@@ -600,14 +612,10 @@
           <filter token="SCALA_FULL_VERSION"         value="${scala.full.version}" />
           <filter token="XML_VERSION"                value="${scala-xml.version.number}" />
           <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
-          <filter token="CONTINUATIONS_PLUGIN_VERSION"  value="${scala-continuations-plugin.version.number}" />
-          <filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
-          <filter token="SCALA_SWING_VERSION"           value="${scala-swing.version.number}" />
+          <filter token="SCALA_SWING_VERSION"        value="${scala-swing.version.number}" />
           <filter token="RELEASE_REPOSITORY"         value="${remote.release.repository}" />
           <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}" />
@@ -746,7 +754,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.number

@@ -3,8 +3,8 @@
 # SNAPSHOT / nightly builds and local builds of source checkouts.
 
 version.major=2
-version.minor=11
-version.patch=8
+version.minor=12
+version.patch=0
 
 # This is the -N part of a version (2.9.1-1). If it's 0, it's dropped from maven versions. It should not be used again.
 version.bnum=0

build.sbt

@@ -83,7 +83,7 @@ lazy val commonSettings = clearSourceAndResourceDirectories ++ Seq[Setting[_]](
   // we always assume that Java classes are standalone and do not have any dependency
   // on Scala classes
   compileOrder := CompileOrder.JavaThenScala,
-  javacOptions in Compile ++= Seq("-g", "-source", "1.5", "-target", "1.6"),
+  javacOptions in Compile ++= Seq("-g", "-source", "1.8", "-target", "1.8"),
   // we don't want any unmanaged jars; as a reminder: unmanaged jar is a jar stored
   // directly on the file system and it's not resolved through Ivy
   // Ant's build stored unmanaged jars in `lib/` directory
@@ -142,6 +142,7 @@ lazy val library = configureAsSubproject(project)
   .settings(generatePropertiesFileSettings: _*)
   .settings(
     name := "scala-library",
+    compileOrder := CompileOrder.Mixed, // needed for JFunction classes in scala.runtime.java8
     scalacOptions in Compile ++= Seq[String]("-sourcepath", (scalaSource in Compile).value.toString),
     // Workaround for a bug in `scaladoc` that it seems to not respect the `-sourcepath` option
     // as a result of this bug, the compiler cannot even initialize Definitions without
@@ -155,7 +156,6 @@ lazy val library = configureAsSubproject(project)
       Seq("-doc-no-compile", libraryAuxDir.toString)
     },
     includeFilter in unmanagedResources in Compile := libIncludes)
-  .dependsOn (forkjoin)
 
 lazy val reflect = configureAsSubproject(project)
   .settings(generatePropertiesFileSettings: _*)
@@ -212,15 +212,6 @@ lazy val scaladoc = configureAsSubproject(project)
 lazy val scalap = configureAsSubproject(project).
   dependsOn(compiler)
 
-// deprecated Scala Actors project
-// TODO: it packages into actors.jar but it should be scala-actors.jar
-lazy val actors = configureAsSubproject(project)
-  .settings(generatePropertiesFileSettings: _*)
-  .settings(name := "scala-actors")
-  .dependsOn(library)
-
-lazy val forkjoin = configureAsForkOfJavaProject(project)
-
 lazy val partestExtras = configureAsSubproject(Project("partest-extras", file(".") / "src" / "partest-extras"))
   .dependsOn(repl)
   .settings(clearSourceAndResourceDirectories: _*)
@@ -259,7 +250,7 @@ lazy val partestJavaAgent = (project in file(".") / "src" / "partest-javaagent")
   )
 
 lazy val test = project.
-  dependsOn(compiler, interactive, actors, repl, scalap, partestExtras, partestJavaAgent, scaladoc).
+  dependsOn(compiler, interactive, repl, scalap, partestExtras, partestJavaAgent, scaladoc).
   configs(IntegrationTest).
   settings(disableDocsAndPublishingTasks: _*).
   settings(commonSettings: _*).
@@ -289,8 +280,8 @@ lazy val test = project.
   )
 
 lazy val root = (project in file(".")).
-  aggregate(library, forkjoin, reflect, compiler, interactive, repl,
-    scaladoc, scalap, actors, partestExtras, junit).settings(
+  aggregate(library, reflect, compiler, interactive, repl,
+    scaladoc, scalap, partestExtras, junit).settings(
     sources in Compile := Seq.empty,
     onLoadMessage := """|*** Welcome to the sbt build definition for Scala! ***
       |This build definition has an EXPERIMENTAL status. If you are not
@@ -318,27 +309,6 @@ def configureAsSubproject(project: Project): Project = {
   (project in base).settings(scalaSubprojectSettings: _*)
 }
 
-/**
- * Configuration for subprojects that are forks of some Java projects
- * we depend on. At the moment there's just forkjoin.
- *
- * We do not publish artifacts for those projects but we package their
- * binaries in a jar of other project (compiler or library).
- *
- * For that reason we disable docs generation, packaging and publishing.
- */
-def configureAsForkOfJavaProject(project: Project): Project = {
-  val base = file(".") / "src" / project.id
-  (project in base).
-    settings(commonSettings: _*).
-    settings(disableDocsAndPublishingTasks: _*).
-    settings(
-      sourceDirectory in Compile := baseDirectory.value,
-      javaSource in Compile := (sourceDirectory in Compile).value,
-      sources in Compile in doc := Seq.empty,
-      classDirectory in Compile := buildDirectory.value / "libs/classes" / thisProject.value.id
-    )
-}
 
 lazy val buildDirectory = settingKey[File]("The directory where all build products go. By default ./build")
 lazy val copyrightString = settingKey[String]("Copyright string.")