[Jython-checkins] jython: Drop support for Java 6. Minimum target is now Java 7.

[jeff.allen]

http://hg.python.org/jython/rev/68e2098b8f12
changeset:   7197:68e2098b8f12
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sat Mar 22 20:49:07 2014 +0000
summary:
  Drop support for Java 6. Minimum target is now Java 7.
Provision for invokedynamic is no longer an exception to the norm.

files:
  build.xml                                              |  16 +------
  src/org/python/compiler/InvokedynamicCodeCompiler.java |  24 ----------
  2 files changed, 1 insertions(+), 39 deletions(-)


diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -93,18 +93,7 @@
         <!-- Usually zero, only used for alpha, beta and candidate versions
              where it must be greater than zero. -->
         <property name="jython.release_serial" value="1"/>
-		
-    	<!--- Indy support -->
-        <!-- FIXME: hard coding to 1.6 for now until the compiler is updated. -->
-        <property name="jython.java.version" value="1.6"/>
-        <!--
-    	<condition property="jython.use.invokedynamic">
-			<equals arg1="${java.specification.version}" arg2="1.7"/>
-    	</condition>
-    	<condition property="jython.java.version" value="1.7" else="1.6">
-    		<isset property="jython.use.invokedynamic"/>
-    	</condition>
-        -->
+        <property name="jython.java.version" value="1.7"/>
 
         <condition property="do.snapshot.build">
             <isset property="snapshot.revision" />
@@ -263,7 +252,6 @@
         <echo>templates.lazy     = '${templates.lazy}'</echo>
         <echo>python.lib         = '${python.lib}'</echo>
         <echo>build.compiler     = '${build.compiler}'</echo>
-    	<echo>jython.use.invokedynamic = '${jython.use.invokedynamic}'</echo>
         <echo>jdk.target.version = '${jdk.target.version}'</echo>
         <echo>jdk.source.version = '${jdk.source.version}'</echo>
         <echo>deprecation        = '${deprecation}'</echo>
@@ -492,8 +480,6 @@
             <compilerarg line="${javac.Xlint}"/>
             <src path="${source.dir}"/>
             <src path="${gensrc.dir}"/>
-        	<exclude name="org/python/compiler/InvokedynamicCodeCompiler.java" unless="jython.use.invokedynamic"/>
-        	<exclude name="org/python/compiler/indy/**" unless="jython.use.invokedynamic"/>
             <exclude name="**/handler/InformixDataHandler.java" unless="informix.present" />
             <exclude name="**/handler/OracleDataHandler.java" unless="oracle.present" />
             <classpath refid="main.classpath" />
diff --git a/src/org/python/compiler/InvokedynamicCodeCompiler.java b/src/org/python/compiler/InvokedynamicCodeCompiler.java
deleted file mode 100644
--- a/src/org/python/compiler/InvokedynamicCodeCompiler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.python.compiler;
-
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.invoke.MutableCallSite;
-
-/**
- * 
- * @author shashank
- */
-public class InvokedynamicCodeCompiler extends CodeCompiler {
-
-	public InvokedynamicCodeCompiler(Module module, boolean print_results) {
-		super(module, print_results);
-	}
-	
-	// just use indy functions to make sure the build process is proper.
-	public void foo(){
-		Class mhClazz = MethodHandles.class;
-		MethodType target = null;
-		new MutableCallSite(target);
-	}
-
-}

-- 
Repository URL: http://hg.python.org/jython