Skip to content

Commit b30f1c6

Browse files
pyricaupyricau
committed
updating and importing into eclipse
1 parent 4389ba3 commit b30f1c6

21 files changed

Lines changed: 228 additions & 36 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
target
2+
bin
3+
gen

‎.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>cleanandroidcode-parent</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎cleanandroidcode-it/.classpath‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
4+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5+
<classpathentry kind="src" output="bin/classes" path="src/main/java">
6+
<attributes>
7+
<attribute name="maven.pomderived" value="true"/>
8+
</attributes>
9+
</classpathentry>
10+
<classpathentry kind="src" output="bin/classes" path="src/test/java">
11+
<attributes>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="src" path="gen"/>
21+
<classpathentry kind="output" path="bin/classes"/>
22+
</classpath>

‎cleanandroidcode-it/.project‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>cleanandroidcode-it</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.jdt.core.javabuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
<buildCommand>
29+
<name>org.eclipse.m2e.core.maven2Builder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
33+
</buildSpec>
34+
<natures>
35+
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
36+
<nature>org.eclipse.jdt.core.javanature</nature>
37+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
38+
</natures>
39+
</projectDescription>

‎cleanandroidcode-it/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.6

‎cleanandroidcode-it/.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎cleanandroidcode-it/AndroidManifest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="info.piwai.cleanandroidcode.test" android:versionCode="1" android:versionName="1.0-SNAPSHOT">
44

5+
<uses-sdk
6+
android:minSdkVersion="8"
7+
android:targetSdkVersion="16" />
8+
59
<application android:icon="@drawable/icon" android:label="@string/app_name">
610
<uses-library android:name="android.test.runner" />
711
</application>

‎cleanandroidcode-it/default.properties‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎cleanandroidcode-it/pom.xml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>com.foo.bar</groupId>
7+
<groupId>info.piwai.cleanandroidcode</groupId>
88
<artifactId>cleanandroidcode-parent</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010
</parent>
1111

12-
<groupId>com.foo.bar</groupId>
13-
<artifactId>cleanandroidcode-it-it</artifactId>
14-
<version>1.0-SNAPSHOT</version>
12+
<artifactId>cleanandroidcode-it</artifactId>
1513
<packaging>apk</packaging>
1614
<name>cleanandroidcode-it - Integration tests</name>
15+
16+
<properties>
17+
<platform.api>16</platform.api>
18+
</properties>
1719

1820
<dependencies>
1921
<dependency>
@@ -25,13 +27,13 @@
2527
<artifactId>android-test</artifactId>
2628
</dependency>
2729
<dependency>
28-
<groupId>com.foo.bar</groupId>
30+
<groupId>info.piwai.cleanandroidcode</groupId>
2931
<artifactId>cleanandroidcode</artifactId>
3032
<type>apk</type>
3133
<version>1.0-SNAPSHOT</version>
3234
</dependency>
3335
<dependency>
34-
<groupId>com.foo.bar</groupId>
36+
<groupId>info.piwai.cleanandroidcode</groupId>
3537
<artifactId>cleanandroidcode</artifactId>
3638
<type>jar</type>
3739
<version>1.0-SNAPSHOT</version>
@@ -52,17 +54,17 @@
5254
<resourceDirectory>${project.basedir}/res</resourceDirectory>
5355
<nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
5456
<sdk>
55-
<platform>10</platform>
57+
<platform>${platform.api}</platform>
5658
</sdk>
57-
<undeployBeforeDeploy>true</undeployBeforeDeploy>
59+
<undeployBeforeDeploy>true</undeployBeforeDeploy>
5860
</configuration>
5961
<extensions>true</extensions>
6062
</plugin>
6163
<plugin>
6264
<artifactId>maven-compiler-plugin</artifactId>
6365
<configuration>
64-
<source>1.5</source>
65-
<target>1.5</target>
66+
<source>1.6</source>
67+
<target>1.6</target>
6668
</configuration>
6769
</plugin>
6870
</plugins>

0 commit comments

Comments
 (0)