# HG changeset patch
# User wenzelm
# Date 1398200519 -7200
# Node ID 5d629da46f04ce444649219d0a142785d92e5fa1
# Parent  f3d34969a29e3b9bc64b464da9d952e5192b59b4
updated to scala-2.11.0 with classpath provided by its etc/settings;

diff -r f3d34969a29e -r 5d629da46f04 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Tue Apr 22 22:27:29 2014 +0200
+++ b/Admin/components/components.sha1	Tue Apr 22 23:01:59 2014 +0200
@@ -66,6 +66,7 @@
 207e4916336335386589c918c5e3f3dcc14698f2  scala-2.10.2.tar.gz
 21c8ee274ffa471ab54d4196ecd827bf3d43e591  scala-2.10.3.tar.gz
 d4688ddaf83037ca43b5bf271325fc53ae70e3aa  scala-2.10.4.tar.gz
+44d12297a78988ffd34363535e6a8e0d94c1d8b5  scala-2.11.0.tar.gz
 b447017e81600cc5e30dd61b5d4962f6da01aa80  scala-2.8.1.final.tar.gz
 5659440f6b86db29f0c9c0de7249b7e24a647126  scala-2.9.2.tar.gz
 43b5afbcad575ab6817d2289756ca22fd2ef43a9  spass-3.8ds.tar.gz
diff -r f3d34969a29e -r 5d629da46f04 Admin/components/main
--- a/Admin/components/main	Tue Apr 22 22:27:29 2014 +0200
+++ b/Admin/components/main	Tue Apr 22 23:01:59 2014 +0200
@@ -9,7 +9,7 @@
 jortho-1.0-2
 kodkodi-1.5.2
 polyml-5.5.1-1
-scala-2.10.4
+scala-2.11.0
 spass-3.8ds
 z3-3.2-1
 z3-4.3.0
diff -r f3d34969a29e -r 5d629da46f04 etc/settings
--- a/etc/settings	Tue Apr 22 22:27:29 2014 +0200
+++ b/etc/settings	Tue Apr 22 23:01:59 2014 +0200
@@ -17,11 +17,6 @@
 ISABELLE_JAVA_SYSTEM_OPTIONS="-Dfile.encoding=UTF-8 -server"
 
 classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
-classpath "$SCALA_HOME/lib/scala-library.jar"
-classpath "$SCALA_HOME/lib/scala-swing.jar"
-classpath "$SCALA_HOME/lib/scala-actors.jar"
-classpath "$SCALA_HOME/lib/scala-compiler.jar"
-classpath "$SCALA_HOME/lib/scala-reflect.jar"
 
 #paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
 unset XMODIFIERS