Skip to content

Commit 19b7c72

Browse files
federicobondfedericobond
committed
Use 1.7 as source and target Java version
1 parent 95d71db commit 19b7c72

File tree

12 files changed

+23
-24
lines changed

12 files changed

+23
-24
lines changed

‎app/build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@
6565
<!-- env used to set classpath below -->
6666
<property environment="env" />
6767

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"
7170
destdir="bin"
7271
excludes="**/tools/format/**"
7372
encoding="UTF-8"

‎build/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
916916
<arg line="core -type f -exec rm -rf {} ';'" />
917917
</exec>
918918

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">
920920

921921
<!-- provide links for java.* classes.
922922
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
943943
<arg line="everything -type f -exec rm -rf {} ';'" />
944944
</exec>
945945

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">
947947

948948
<arg value="-notimestamp" />
949949

‎build/shared/tools/MovieMaker/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<target name="compile" description="Compile sources">
1010
<mkdir dir="bin" />
11-
<javac target="1.6"
12-
source="1.6"
11+
<javac target="1.7"
12+
source="1.7"
1313
srcdir="src"
1414
destdir="bin"
1515
encoding="UTF-8"

‎core/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<mkdir dir="bin" />
2828
<javac source="1.7"
29-
target="1.7"
29+
target="1.7"
3030
encoding="UTF-8"
3131
includeAntRuntime="false"
3232
debug="true"

‎java/libraries/dxf/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
1414

1515
<mkdir dir="bin" />
16-
<javac source="1.6"
17-
target="1.6"
16+
<javac source="1.7"
17+
target="1.7"
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"

‎java/libraries/glw/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
1414

1515
<mkdir dir="bin" />
16-
<javac source="1.6"
17-
target="1.6"
16+
<javac source="1.7"
17+
target="1.7"
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"

‎java/libraries/lwjgl/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
1414

1515
<mkdir dir="bin" />
16-
<javac source="1.6"
17-
target="1.6"
16+
<javac source="1.7"
17+
target="1.7"
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"

‎java/libraries/net/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
1414

1515
<mkdir dir="bin" />
16-
<javac source="1.6"
17-
target="1.6"
16+
<javac source="1.7"
17+
target="1.7"
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"

‎java/libraries/pdf/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
1414

1515
<mkdir dir="bin" />
16-
<javac source="1.6"
17-
target="1.6"
16+
<javac source="1.7"
17+
target="1.7"
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"

‎java/libraries/serial/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
1414

1515
<mkdir dir="bin" />
16-
<javac source="1.6"
17-
target="1.6"
16+
<javac source="1.7"
17+
target="1.7"
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"

0 commit comments

Comments
 (0)