diff options
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | lib/msil.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala | 4 |
6 files changed, 7 insertions, 7 deletions
@@ -1472,7 +1472,7 @@ BOOTRAPING TEST AND TEST SUITE ============================================================================ --> <target name="test.stability" depends="strap.done"> - <same dir="${build-quick.dir}" todir="${build-strap.dir}" failondifferent="no"> + <same dir="${build-quick.dir}" todir="${build-strap.dir}" failondifferent="yes"> <exclude name="**/*.properties"/> <exclude name="bin/**"/> <exclude name="*.complete"/> diff --git a/lib/msil.jar.desired.sha1 b/lib/msil.jar.desired.sha1 index 0079fc4d47..80334bd170 100644 --- a/lib/msil.jar.desired.sha1 +++ b/lib/msil.jar.desired.sha1 @@ -1 +1 @@ -b73c6a7eafee8d31d7ddf4066dd8f640163939b6 ?msil.jar +6c73420b6ee648e25edaecb8c856655c1df955b0 ?msil.jar diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index b8759d191b..9bff0a59c9 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -6e45b297a30df884614addeb027b5ebf76485f11 ?scala-compiler.jar +a3ab16303cbfe965355ee1fd681531bcac7a1ceb ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index e0ef39b088..62424c039f 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -0c72a64d2744d408a66d5207d68951b3389990fc ?scala-library-src.jar +653f5c7567741d38f657ada9cd7b1f420718e22c ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index b70c4f6b6e..09f5784f32 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -c077142101bb954b29c460580a2450cdc4742ab0 ?scala-library.jar +db4f86be5742b02a059639bdd0d702d32080b4e7 ?scala-library.jar diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala index ff000c85d6..be9b3e949f 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala @@ -73,15 +73,15 @@ abstract class UnPickler { //---cut here--- +/* // transiently, use this bit as long as stability fails. if (major != 4 && major != 5) +*/ // once stability is restored, use the following bit instead: -/* if (major == 4) { // !!! temporarily accept 4 as version. println("WARNING: old class format, please recompile "+filename) } else -*/ //---cut here--- if (major != MajorVersion || minor > MinorVersion) |