Skip to content

Commit ba413ef

Browse files
committed
Upgraded to JDK8.
I had no problems building both aima-code and aima-gui under JDK8.
1 parent f8d1622 commit ba413ef

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.7
6+
org.eclipse.jdt.core.compiler.compliance=1.8
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12-
org.eclipse.jdt.core.compiler.source=1.7
12+
org.eclipse.jdt.core.compiler.source=1.8

aima-core/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ aima-core.dir.build.release=${aima-core.dir.build}/release
2020
# COMPILER VALUES
2121
aima-core.compiler.debug=true
2222
aima-core.compiler.debuglevel=source,lines,vars
23-
aima-core.compiler.source=1.7
24-
aima-core.compiler.target=1.7
23+
aima-core.compiler.source=1.8
24+
aima-core.compiler.target=1.8

aima-gui/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry excluding="aima/gui/fx/demo/|aima/gui/fx/framework/|aima/gui/fx/views/" kind="src" path="src/main/java"/>
3+
<classpathentry kind="src" path="src/main/java"/>
44
<classpathentry kind="src" path="src/main/resources"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/aima-core"/>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.7
6+
org.eclipse.jdt.core.compiler.compliance=1.8
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
1111
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
13-
org.eclipse.jdt.core.compiler.source=1.7
13+
org.eclipse.jdt.core.compiler.source=1.8

aima-gui/build.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
<target name="aima-gui.compile-all" depends="aima-core.compile-all,aima-gui.makedirs">
3131
<javac srcdir="${aima-gui.dir.src}/main"
32-
excludes="java/aima/gui/fx/**"
3332
destdir="${aima-gui.dir.build.bin}/main"
3433
classpathref="aima-gui.classpath"
3534
debug="${aima-core.compiler.debug}"
@@ -46,7 +45,6 @@
4645
<javadoc access="protected" author="true"
4746
destdir="${aima-gui.dir.build.doc}/javadoc"
4847
packagenames="aima.*"
49-
excludepackagenames="aima.gui.fx.*"
5048
sourcepathref="aima-gui.javadoc.src" >
5149
</javadoc>
5250
</target>

aima-gui/src/main/java/aima/gui/fx/demo/agent/map/RouteFindingAgentApp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import aima.core.environment.map.SimplifiedRoadMapOfAustralia;
1313
import aima.core.environment.map.SimplifiedRoadMapOfPartOfRomania;
1414
import aima.core.util.CancelableThread;
15-
import aima.core.util.datastructure.Point2D;
15+
import aima.core.util.math.geom.shapes.Point2D;
1616
import aima.gui.fx.framework.IntegrableApplication;
1717
import aima.gui.fx.framework.Parameter;
1818
import aima.gui.fx.framework.SimulationPaneBuilder;

aima-gui/src/main/java/aima/gui/fx/views/MapEnvironmentViewCtrl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import aima.core.agent.Environment;
88
import aima.core.environment.map.Map;
99
import aima.core.environment.map.MapEnvironment;
10-
import aima.core.util.datastructure.Point2D;
10+
import aima.core.util.math.geom.shapes.Point2D;
1111
import javafx.scene.layout.Pane;
1212
import javafx.scene.layout.StackPane;
1313
import javafx.scene.paint.Color;

0 commit comments

Comments
 (0)