Skip to content

Commit cf580f4

Browse files
committed
Set java source level 1.6. Removed test source folder.
1 parent 35d5692 commit cf580f4

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

.classpath

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" output="bin/classes" path="src">
4-
<attributes><attribute name="maven.pomderived" value="true"/></attributes>
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
58
</classpathentry>
6-
<classpathentry kind="src" output="bin/classes" path="test">
7-
<attributes><attribute name="maven.pomderived" value="true"/></attributes>
8-
</classpathentry>
9-
<classpathentry kind="src" path="gen" output="bin/classes" />
9+
<classpathentry kind="src" output="bin/classes" path="gen"/>
1010
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
1111
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
1212
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
13-
<attributes><attribute name="maven.pomderived" value="true"/></attributes>
13+
<attributes>
14+
<attribute name="maven.pomderived" value="true"/>
15+
</attributes>
1416
</classpathentry>
1517
<classpathentry kind="output" path="bin/classes"/>
1618
</classpath>

.settings/org.eclipse.jdt.core.prefs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
99
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
1010
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
1111
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
12-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
13-
org.eclipse.jdt.core.compiler.compliance=1.5
12+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
13+
org.eclipse.jdt.core.compiler.compliance=1.6
1414
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
15-
org.eclipse.jdt.core.compiler.source=1.5
15+
org.eclipse.jdt.core.compiler.source=1.6
1616
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
1717
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
1818
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

pom.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@
2222
<directory>bin</directory>
2323
<outputDirectory>bin/classes</outputDirectory>
2424
<sourceDirectory>src</sourceDirectory>
25-
<testSourceDirectory>test</testSourceDirectory>
26-
2725
<plugins>
26+
<plugin>
27+
<artifactId>maven-compiler-plugin</artifactId>
28+
<version>2.3.2</version>
29+
<configuration><source>1.6</source><target>1.6</target></configuration>
30+
</plugin>
2831
<plugin>
2932
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
3033
<artifactId>android-maven-plugin</artifactId>

0 commit comments

Comments
 (0)