# HG changeset patch
# User wenzelm
# Date 1495405405 -7200
# Node ID 94b0da1b242ed449fd12de71a05fe1e543d5075f
# Parent  18f5014331a1f407fb2f2a3b319ed7eb238f6595
back to scala-2.11.8 due to apparent non-termination of HOL-Codegenerator_Test;

diff -r 18f5014331a1 -r 94b0da1b242e Admin/components/main
--- a/Admin/components/main	Sun May 21 23:47:55 2017 +0200
+++ b/Admin/components/main	Mon May 22 00:23:25 2017 +0200
@@ -12,7 +12,7 @@
 nunchaku-0.3
 polyml-5.6-1
 postgresql-42.1.1
-scala-2.12.2
+scala-2.11.8
 ssh-java-20161009
 spass-3.8ds
 sqlite-jdbc-3.18.0-1
diff -r 18f5014331a1 -r 94b0da1b242e src/HOL/Codegenerator_Test/Generate.thy
--- a/src/HOL/Codegenerator_Test/Generate.thy	Sun May 21 23:47:55 2017 +0200
+++ b/src/HOL/Codegenerator_Test/Generate.thy	Mon May 22 00:23:25 2017 +0200
@@ -18,4 +18,3 @@
 export_code _ checking SML OCaml? Haskell? Scala
 
 end
-
diff -r 18f5014331a1 -r 94b0da1b242e src/Pure/General/antiquote.scala
--- a/src/Pure/General/antiquote.scala	Sun May 21 23:47:55 2017 +0200
+++ b/src/Pure/General/antiquote.scala	Mon May 22 00:23:25 2017 +0200
@@ -55,3 +55,4 @@
     }
   }
 }
+
diff -r 18f5014331a1 -r 94b0da1b242e src/Tools/jEdit/src/theories_dockable.scala
--- a/src/Tools/jEdit/src/theories_dockable.scala	Sun May 21 23:47:55 2017 +0200
+++ b/src/Tools/jEdit/src/theories_dockable.scala	Mon May 22 00:23:25 2017 +0200
@@ -166,7 +166,7 @@
 
   private class Node_Renderer extends ListView.Renderer[Document.Node.Name]
   {
-    def componentFor(list: ListView[_ <: isabelle.Document.Node.Name], isSelected: Boolean,
+    def componentFor(list: ListView[_], isSelected: Boolean,
       focused: Boolean, name: Document.Node.Name, index: Int): Component =
     {
       val component = Node_Renderer_Component
diff -r 18f5014331a1 -r 94b0da1b242e src/Tools/jEdit/src/timing_dockable.scala
--- a/src/Tools/jEdit/src/timing_dockable.scala	Sun May 21 23:47:55 2017 +0200
+++ b/src/Tools/jEdit/src/timing_dockable.scala	Mon May 22 00:23:25 2017 +0200
@@ -65,7 +65,7 @@
 
     class Renderer extends ListView.Renderer[Entry]
     {
-      def componentFor(list: ListView[_ <: Timing_Dockable.this.Entry],
+      def componentFor(list: ListView[_],
         isSelected: Boolean, focused: Boolean, entry: Entry, index: Int): Component =
       {
         val component = Renderer_Component