diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-03 15:33:28 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-03 17:32:05 -0800 |
| commit | 8d8a23c9fe1f339b962f50b6e3347e7666ad6c0f (patch) | |
| tree | 3d6cf6e04a94d39e2ad3b4c26f2fd22809bebf71 | |
| parent | 13419e580337132002eb9d8336c36f4bf072fe76 (diff) | |
| download | scala-8d8a23c9fe1f339b962f50b6e3347e7666ad6c0f.tar.gz scala-8d8a23c9fe1f339b962f50b6e3347e7666ad6c0f.tar.bz2 scala-8d8a23c9fe1f339b962f50b6e3347e7666ad6c0f.zip | |
Check library/reflect bincompat against 2.11.0-RC1
Changes in the package scala.reflect.internals are ignored.
| -rw-r--r-- | bincompat-backward.whitelist.conf | 7 | ||||
| -rw-r--r-- | bincompat-forward.whitelist.conf | 7 | ||||
| -rw-r--r-- | build-ant-macros.xml | 4 | ||||
| -rwxr-xr-x | build.xml | 11 |
4 files changed, 19 insertions, 10 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf new file mode 100644 index 0000000000..9e93c32c70 --- /dev/null +++ b/bincompat-backward.whitelist.conf @@ -0,0 +1,7 @@ +filter { + packages = [ + "scala.reflect.internal" + # "scala.concurrent.impl" + # "scala.reflect.runtime" + ] +}
\ No newline at end of file diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf new file mode 100644 index 0000000000..9e93c32c70 --- /dev/null +++ b/bincompat-forward.whitelist.conf @@ -0,0 +1,7 @@ +filter { + packages = [ + "scala.reflect.internal" + # "scala.concurrent.impl" + # "scala.reflect.runtime" + ] +}
\ No newline at end of file diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 458d1014c2..3fc457b2bd 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -534,8 +534,8 @@ <macrodef name="bc.check"> <attribute name="project"/> <sequential> - <bc.run-mima jar-name="scala-@{project}" prev="${org.scala-lang:scala-@{project}:jar}" curr="${@{name}.jar}" direction="backward"/> - <bc.run-mima jar-name="scala-@{project}" prev="${@{name}.jar}" curr="${org.scala-lang:scala-@{project}:jar}" direction="forward"/> + <bc.run-mima jar-name="scala-@{project}" prev="${org.scala-lang:scala-@{project}:jar}" curr="${@{project}.jar}" direction="backward"/> + <bc.run-mima jar-name="scala-@{project}" prev="${@{project}.jar}" curr="${org.scala-lang:scala-@{project}:jar}" direction="forward"/> </sequential> </macrodef> @@ -1483,14 +1483,14 @@ TODO: BINARY COMPATIBILITY TESTING ============================================================================ --> <target name="bc.init" depends="init" unless="maven-deps-done-mima"> - <property name="bc-reference-version" value="2.11.0"/> + <property name="bc-reference-version" value="2.11.0-RC1"/> <property name="bc-build.dir" value="${build.dir}/bc"/> <!-- Obtain mima --> <mkdir dir="${bc-build.dir}"/> <!-- Pull down MIMA --> <artifact:dependencies pathId="mima.classpath"> - <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5"/> + <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.6"/> </artifact:dependencies> <artifact:dependencies pathId="old.bc.classpath"> <dependency groupId="org.scala-lang" artifactId="scala-library" version="${bc-reference-version}"/> @@ -1499,13 +1499,8 @@ TODO: <property name="maven-deps-done-mima" value="true"/> </target> - - <target name="test.bc-opt" description="Optimized version of test.bc."> <optimized name="test.bc"/></target> - - <!-- Enable after the release of the 2.11.0 or a prior RC that estabilishes the new baseline. --> - <target name="test.bc"></target> - <target name="test.bc.disabled" depends="bc.init, pack.lib, pack.reflect"> + <target name="test.bc" depends="bc.init, pack.lib, pack.reflect"> <bc.check project="library"/> <bc.check project="reflect"/> </target> |