changeset 100:ad500347ebc8

Merge
author tbell
date Mon, 27 Jul 2009 23:03:37 -0700
parents d5e36cb83d8c 2a160e4e0d06
children 5182bcc9c60c
files
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/Makefile	Fri Jul 24 13:39:48 2009 -0700
+++ b/make/Makefile	Mon Jul 27 23:03:37 2009 -0700
@@ -110,7 +110,7 @@
 ifdef TARGET_CLASS_VERSION
     TARGET_LEVEL = $(TARGET_CLASS_VERSION)
 else
-    TARGET_LEVEL = 6
+    TARGET_LEVEL = 7
 endif
 
 ifndef TARGET_JAVA
--- a/make/common/shared/Defs-java.gmk	Fri Jul 24 13:39:48 2009 -0700
+++ b/make/common/shared/Defs-java.gmk	Mon Jul 27 23:03:37 2009 -0700
@@ -107,12 +107,12 @@
 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
 JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
 
-# Add the source level (currently all source is 1.5, should this be 1.6?)
-LANGUAGE_VERSION = -source 1.5
+# Add the source level
+LANGUAGE_VERSION = -source 7
 JAVACFLAGS  += $(LANGUAGE_VERSION)
 
-# Add the class version we want (currently this is 5, should it be 6 or even 7?)
-TARGET_CLASS_VERSION = 5
+# Add the class version we want
+TARGET_CLASS_VERSION = 7
 CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
 JAVACFLAGS  += $(CLASS_VERSION)
 JAVACFLAGS  += -encoding ascii