Commit 19b7c72
committed
Use 1.7 as source and target Java version
1 parent 95d71db commit 19b7c72
12 files changed
Lines changed: 23 additions & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -65,9 +65,8 @@ | |||
| 65 | 65 | <!-- env used to set classpath below --> | |
| 66 | 66 | <property environment="env" /> | |
| 67 | 67 | ||
| 68 | - <!-- need to stay at 1.6 until we update ecj.jar --> | ||
| 69 | - <javac source="1.6" | ||
| 70 | - target="1.6" | ||
| 68 | + <javac source="1.7" | ||
| 69 | + target="1.7" | ||
| 71 | 70 | destdir="bin" | |
| 72 | 71 | excludes="**/tools/format/**" | |
| 73 | 72 | encoding="UTF-8" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -916,7 +916,7 @@ remove the spaces for depth since it should be double dash, but screws up commen | |||
| 916 | 916 | <arg line="core -type f -exec rm -rf {} ';'" /> | |
| 917 | 917 | </exec> | |
| 918 | 918 | ||
| 919 | - <javadoc access="public" author="false" classpath="../core/library/jogl-all.jar:../core/bin:../core/library/gluegen-rt.jar" destdir="javadoc/core" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="false" use="false" version="false"> | ||
| 919 | + <javadoc access="public" author="false" classpath="../core/library/jogl-all.jar:../core/bin:../core/library/gluegen-rt.jar" destdir="javadoc/core" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="false" use="false" version="false"> | ||
| 920 | 920 | ||
| 921 | 921 | <!-- provide links for java.* classes. | |
| 922 | 922 | also suppresses the java.lang prefix in the text. --> | |
@@ -943,7 +943,7 @@ remove the spaces for depth since it should be double dash, but screws up commen | |||
| 943 | 943 | <arg line="everything -type f -exec rm -rf {} ';'" /> | |
| 944 | 944 | </exec> | |
| 945 | 945 | ||
| 946 | - <javadoc access="public" author="false" classpath="../java/libraries/video/library/jna.jar:../java/libraries/serial/bin:lib/antlr.jar:../core/library/jogl-all.jar:../java/libraries/video/bin:lib/apple.jar:lib/jna.jar:lib/ant-launcher.jar:../java/libraries/pdf/bin:lib/ant.jar:../core/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/video/library/gstreamer-java.jar:lib/org-netbeans-swing-outline.jar:../java/libraries/dxf/bin:bin:../java/libraries/net/bin:../java/libraries/serial/library/jssc.jar:../core/library/gluegen-rt.jar:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="false" use="false" version="false" noqualifier="all"> | ||
| 946 | + <javadoc access="public" author="false" classpath="../java/libraries/video/library/jna.jar:../java/libraries/serial/bin:lib/antlr.jar:../core/library/jogl-all.jar:../java/libraries/video/bin:lib/apple.jar:lib/jna.jar:lib/ant-launcher.jar:../java/libraries/pdf/bin:lib/ant.jar:../core/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/video/library/gstreamer-java.jar:lib/org-netbeans-swing-outline.jar:../java/libraries/dxf/bin:bin:../java/libraries/net/bin:../java/libraries/serial/library/jssc.jar:../core/library/gluegen-rt.jar:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="false" use="false" version="false" noqualifier="all"> | ||
| 947 | 947 | ||
| 948 | 948 | <arg value="-notimestamp" /> | |
| 949 | 949 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,8 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | 9 | <target name="compile" description="Compile sources"> | |
| 10 | 10 | <mkdir dir="bin" /> | |
| 11 | - <javac target="1.6" | ||
| 12 | - source="1.6" | ||
| 11 | + <javac target="1.7" | ||
| 12 | + source="1.7" | ||
| 13 | 13 | srcdir="src" | |
| 14 | 14 | destdir="bin" | |
| 15 | 15 | encoding="UTF-8" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | 27 | <mkdir dir="bin" /> | |
| 28 | 28 | <javac source="1.7" | |
| 29 | - target="1.7" | ||
| 29 | + target="1.7" | ||
| 30 | 30 | encoding="UTF-8" | |
| 31 | 31 | includeAntRuntime="false" | |
| 32 | 32 | debug="true" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,8 +13,8 @@ | |||
| 13 | 13 | <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" /> | |
| 14 | 14 | ||
| 15 | 15 | <mkdir dir="bin" /> | |
| 16 | - <javac source="1.6" | ||
| 17 | - target="1.6" | ||
| 16 | + <javac source="1.7" | ||
| 17 | + target="1.7" | ||
| 18 | 18 | srcdir="src" destdir="bin" | |
| 19 | 19 | encoding="UTF-8" | |
| 20 | 20 | includeAntRuntime="false" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,8 +13,8 @@ | |||
| 13 | 13 | <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" /> | |
| 14 | 14 | ||
| 15 | 15 | <mkdir dir="bin" /> | |
| 16 | - <javac source="1.6" | ||
| 17 | - target="1.6" | ||
| 16 | + <javac source="1.7" | ||
| 17 | + target="1.7" | ||
| 18 | 18 | srcdir="src" destdir="bin" | |
| 19 | 19 | encoding="UTF-8" | |
| 20 | 20 | includeAntRuntime="false" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,8 +13,8 @@ | |||
| 13 | 13 | <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" /> | |
| 14 | 14 | ||
| 15 | 15 | <mkdir dir="bin" /> | |
| 16 | - <javac source="1.6" | ||
| 17 | - target="1.6" | ||
| 16 | + <javac source="1.7" | ||
| 17 | + target="1.7" | ||
| 18 | 18 | srcdir="src" destdir="bin" | |
| 19 | 19 | encoding="UTF-8" | |
| 20 | 20 | includeAntRuntime="false" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,8 +13,8 @@ | |||
| 13 | 13 | <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" /> | |
| 14 | 14 | ||
| 15 | 15 | <mkdir dir="bin" /> | |
| 16 | - <javac source="1.6" | ||
| 17 | - target="1.6" | ||
| 16 | + <javac source="1.7" | ||
| 17 | + target="1.7" | ||
| 18 | 18 | srcdir="src" destdir="bin" | |
| 19 | 19 | encoding="UTF-8" | |
| 20 | 20 | includeAntRuntime="false" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,8 +13,8 @@ | |||
| 13 | 13 | <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" /> | |
| 14 | 14 | ||
| 15 | 15 | <mkdir dir="bin" /> | |
| 16 | - <javac source="1.6" | ||
| 17 | - target="1.6" | ||
| 16 | + <javac source="1.7" | ||
| 17 | + target="1.7" | ||
| 18 | 18 | srcdir="src" destdir="bin" | |
| 19 | 19 | encoding="UTF-8" | |
| 20 | 20 | includeAntRuntime="false" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,8 +13,8 @@ | |||
| 13 | 13 | <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" /> | |
| 14 | 14 | ||
| 15 | 15 | <mkdir dir="bin" /> | |
| 16 | - <javac source="1.6" | ||
| 17 | - target="1.6" | ||
| 16 | + <javac source="1.7" | ||
| 17 | + target="1.7" | ||
| 18 | 18 | srcdir="src" destdir="bin" | |
| 19 | 19 | encoding="UTF-8" | |
| 20 | 20 | includeAntRuntime="false" | |
0 commit comments