Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Jelly Bean support #37

Merged
merged 2 commits into from

2 participants

@peter-budo
  • Added support for Jelly Bean
  • Changed default platform to 16
  • Changed version of android-maven-plugin to 3.3.0, maven-compiler-plugin to 2.5.1
  • Updated README
peter-budo added some commits
@peter-budo peter-budo - Added support for Jelly Bean
- Changed default platform to 16
- Changed version of android-maven-plugin to 3.3.0, maven-compiler-plugin to 2.5.1
- Updated README
0f933ed
@peter-budo peter-budo Merge remote-tracking branch 'origin/master' into jelly-bean 3d2eed8
@philippkumar philippkumar merged commit 25ac065 into akquinet:master
@peter-budo

Hope to see this out as new version soon ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 2, 2012
  1. @peter-budo

    - Added support for Jelly Bean

    peter-budo authored
    - Changed default platform to 16
    - Changed version of android-maven-plugin to 3.3.0, maven-compiler-plugin to 2.5.1
    - Updated README
  2. @peter-budo
This page is out of date. Refresh to see the latest.
View
14 README.md
@@ -4,7 +4,7 @@ android-archetypes
This projects provides several Maven archetypes for Android. Those archetypes allows to quickly bootstrap a Maven project
to develop an android application.
-These artifacts are based on the android-maven-plugin (http://code.google.com/p/maven-android-plugin/). It currently uses the 3.1.1 version.
+These artifacts are based on the android-maven-plugin (http://code.google.com/p/maven-android-plugin/). It currently uses the 3.3.0 version.
The android-quickstart archetype
--------------------------------
@@ -14,7 +14,7 @@ way to initiate an android project:
mvn archetype:generate \
-DarchetypeArtifactId=android-quickstart \
-DarchetypeGroupId=de.akquinet.android.archetypes \
- -DarchetypeVersion=1.0.8 \
+ -DarchetypeVersion=1.0.9 \
-DgroupId=your.company \
-DartifactId=my-android-application
@@ -22,7 +22,7 @@ You can also set three optional properties :
* The created 'package' with '-Dpackage=your.company.android'. By default it uses the given groupId.
* The Android emulator's name to use with '-Demulator=my-avd'. If none specified the property <emulator> will be ignored in the pom file.
-* The targeted Android platform with '-Dplatform=7'. The Android SDK version will be automatically fetched to fit the corresponding API level. Available API Level are 3, 4, 7, 8, 9, 10 and 14. By default, it uses 10 (android 2.3.3).
+* The targeted Android platform with '-Dplatform=7'. The Android SDK version will be automatically fetched to fit the corresponding API level. Available API Level are 3, 4, 7, 8, 9, 10, 14 and 16. By default, it uses 16 (android 4.1.1.4).
Once generated, the application is ready to be built and deployed (you may need to configure your ANDROID_HOME environment variable to point to your Android SDK). Start an android emulator, or plug an Android dev phone,
and launch:
@@ -41,13 +41,13 @@ This archetype creates a multi-module project containing an android application
mvn archetype:generate \
-DarchetypeArtifactId=android-with-test \
-DarchetypeGroupId=de.akquinet.android.archetypes \
- -DarchetypeVersion=1.0.8 \
+ -DarchetypeVersion=1.0.9 \
-DgroupId=com.foo.bar \
-DartifactId=my-android-project \
-Dpackage=com.foo.bar.android
The 'package' value is optional (by default use the groupId). You can also set the targeted Android platform with
-'-Dplatform=x'. By default, it uses 10 (android 2.3.3).
+'-Dplatform=x'. By default, it uses 16 (android 4.1.1.4).
Once generated, the application is ready to be built and tested. Start an android emulator, or plug an Android dev phone,
and launch:
@@ -88,13 +88,13 @@ This archetype extends `android-with-test` with release management.
mvn archetype:generate \
-DarchetypeArtifactId=android-release \
-DarchetypeGroupId=de.akquinet.android.archetypes \
- -DarchetypeVersion=1.0.8 \
+ -DarchetypeVersion=1.0.9 \
-DgroupId=com.foo.bar \
-DartifactId=my-android-project \
-Dpackage=com.foo.bar.android
The 'package' value is optional (by default use the groupId). You can also set the targeted Android platform with
-'-Dplatform=x'. By default, it uses 10 (android 2.3.3).
+'-Dplatform=x'. By default, it uses 16 (android 4.1.1.4).
Once generated, the application is ready to be built and tested. Start an android emulator, or plug an Android dev phone,
and launch:
View
8 android-archetypes-it/src/test/java/de/akquinet/android/archetypes/QuickstartArchetypeTest.java
@@ -71,12 +71,12 @@ public void testQuickStartDefault() throws VerificationException, IOException {
Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
// Check that the Eclipse file is created (default.properties)
- Helper.assertContains(new File("target/it/quickstart-default/android-test/default.properties"), "target=android-10");
+ Helper.assertContains(new File("target/it/quickstart-default/android-test/default.properties"), "target=android-16");
}
/**
@@ -219,12 +219,12 @@ public void testQuickStartWithEmulator() throws VerificationException, IOExcepti
Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
Helper.assertContains(new File("target/it/quickstart-default/android-test/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
// Check that the Eclipse file is created (default.properties)
- Helper.assertContains(new File("target/it/quickstart-default/android-test/default.properties"), "target=android-10");
+ Helper.assertContains(new File("target/it/quickstart-default/android-test/default.properties"), "target=android-16");
// Check the emulator part
Helper.assertContains(new File("target/it/quickstart-default/android-test/pom.xml"), "<avd>test</avd>");
View
12 android-archetypes-it/src/test/java/de/akquinet/android/archetypes/ReleaseArchetypeTest.java
@@ -86,7 +86,7 @@ public void testWithTestDefault() throws VerificationException, IOException {
Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"),"<artifactId>maven-enforcer-plugin</artifactId>");
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
@@ -99,8 +99,8 @@ public void testWithTestDefault() throws VerificationException, IOException {
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java"), "super(HelloAndroidActivity.class);");
// Check that the Eclipse file is created (default.properties)
- Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-10");
- Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-10");
+ Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-16");
+ Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-16");
}
/**
@@ -282,7 +282,7 @@ public void testWithTestWithEmulator() throws VerificationException, IOException
Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"),"<artifactId>maven-enforcer-plugin</artifactId>");
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/release-default/android-test/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
@@ -295,8 +295,8 @@ public void testWithTestWithEmulator() throws VerificationException, IOException
Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java"), "super(HelloAndroidActivity.class);");
// Check that the Eclipse file is created (default.properties)
- Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-10");
- Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-10");
+ Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-16");
+ Helper.assertContains(new File("target/it/release-default/android-test/"+ Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-16");
}
/**
View
16 android-archetypes-it/src/test/java/de/akquinet/android/archetypes/WithTestsArchetypeTest.java
@@ -77,12 +77,12 @@ public void testWithTestDefault() throws VerificationException, IOException {
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
@@ -90,8 +90,8 @@ public void testWithTestDefault() throws VerificationException, IOException {
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-10");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-10");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-16");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-16");
}
@@ -267,19 +267,19 @@ public void testWithTestWithEmulator() throws VerificationException, IOException
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "<activity android:name=\".HelloAndroidActivity\">");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/AndroidManifest.xml"), "package=\"android.archetypes.test\"");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<artifactId>android-maven-plugin</artifactId>");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>10</platform>");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<platform>16</platform>");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<uses-library android:name=\"android.test.runner\" />");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/AndroidManifest.xml"), "<instrumentation android:targetPackage=\"android.archetypes.test\"");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/src/main/java/android/archetypes/test/test/HelloAndroidActivityTest.java"), "super(HelloAndroidActivity.class);");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-10");
- Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-10");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "/default.properties"), "target=android-16");
+ Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/default.properties"), "target=android-16");
Helper.assertContains(new File("target/it/with-test-default/android-test/" + Constants.TEST_ARTIFACT_ID + "-it/pom.xml"), "<avd>test</avd>");
View
4 android-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -6,13 +6,13 @@
<requiredProperties>
<requiredProperty key="platform">
- <defaultValue>10</defaultValue>
+ <defaultValue>16</defaultValue>
</requiredProperty>
<requiredProperty key="emulator">
<defaultValue>not-specified</defaultValue>
</requiredProperty>
<requiredProperty key="android-plugin-version">
- <defaultValue>3.1.1</defaultValue>
+ <defaultValue>3.3.0</defaultValue>
</requiredProperty>
</requiredProperties>
View
9 android-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,8 @@
#elseif(${platform} == 8) 2.2.1
#elseif(${platform} == 9) 2.3.1
#elseif(${platform} == 10) 2.3.3
- #{else} 4.0.1.2
+ #elseif(${platform} == 14) 4.0.1.2
+ #elseif(${platform} == 16) 4.1.1.4
#end</platform.version>
</properties>
@@ -54,10 +55,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
</plugins>
View
4 android-release/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,13 +5,13 @@
<requiredProperties>
<requiredProperty key="platform">
- <defaultValue>10</defaultValue>
+ <defaultValue>16</defaultValue>
</requiredProperty>
<requiredProperty key="emulator">
<defaultValue>not-specified</defaultValue>
</requiredProperty>
<requiredProperty key="android-plugin-version">
- <defaultValue>3.1.1</defaultValue>
+ <defaultValue>3.3.0</defaultValue>
</requiredProperty>
</requiredProperties>
View
7 android-release/src/main/resources/archetype-resources/__rootArtifactId__-it/pom.xml
@@ -26,11 +26,8 @@
<dependencies>
<dependency>
<groupId>com.google.android</groupId>
- <artifactId>android</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
@@ -38,12 +35,14 @@
<type>apk</type>
<version>${version}</version>
<classifier>${zipaligned-classifier}</classifier> <!-- classifier set according to the ran profile -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}</artifactId>
<type>jar</type>
<version>${version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
View
454 android-release/src/main/resources/archetype-resources/pom.xml
@@ -1,238 +1,244 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-parent</artifactId>
- <version>${version}</version>
- <packaging>pom</packaging>
- <name>${artifactId} - Parent</name>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-parent</artifactId>
+ <version>${version}</version>
+ <packaging>pom</packaging>
+ <name>${artifactId} - Parent</name>
- <modules>
- <module>${rootArtifactId}</module>
- <module>${rootArtifactId}-it</module>
- </modules>
+ <modules>
+ <module>${rootArtifactId}</module>
+ <module>${rootArtifactId}-it</module>
+ </modules>
- <properties>
- <platform.version>#if(${platform} == 3) 1.5_r4
- #elseif(${platform} == 4) 1.6_r2
- #elseif(${platform} == 7) 2.1.2
- #elseif(${platform} == 8) 2.2.1
- #elseif(${platform} == 9) 2.3.1
- #elseif(${platform} == 10) 2.3.3
- #{else} 4.0.1.2
- #end</platform.version>
- </properties>
+ <properties>
+ <platform.version>#if(${platform} == 3) 1.5_r4
+ #elseif(${platform} == 4) 1.6_r2
+ #elseif(${platform} == 7) 2.1.2
+ #elseif(${platform} == 8) 2.2.1
+ #elseif(${platform} == 9) 2.3.1
+ #elseif(${platform} == 10) 2.3.3
+ #elseif(${platform} == 14) 4.0.1.2
+ #elseif(${platform} == 16) 4.1.1.4
+ #end
+ </platform.version>
+ </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android-test</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android-test</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Androlog is a logging and reporting library for Android -->
- <dependency>
- <groupId>de.akquinet.android.androlog</groupId>
- <artifactId>androlog</artifactId>
- <version>1.0.5</version>
- </dependency>
+ <!-- Androlog is a logging and reporting library for Android -->
+ <dependency>
+ <groupId>de.akquinet.android.androlog</groupId>
+ <artifactId>androlog</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>${android-plugin-version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
+ <assetsDirectory>${project.basedir}/assets</assetsDirectory>
+ <resourceDirectory>${project.basedir}/res</resourceDirectory>
+ <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
+ <sdk>
+ <platform>${platform}</platform>
+ </sdk>
+ #if(${emulator} != "not-specified")
+ <emulator>
+ <avd>${emulator}</avd>
+ </emulator>
+ #end
+ <undeployBeforeDeploy>true</undeployBeforeDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>true</inherited>
+ <configuration>
+ <removeExistingSignatures>true</removeExistingSignatures>
+ <archiveDirectory/>
+ <archive>${project.build.directory}/${project.build.finalName}.${project.packaging}</archive>
+ <verbose>true</verbose>
+ <certs>true</certs>
+ <keystore>${sign.keystore}</keystore>
+ <alias>${sign.alias}</alias>
+ <storepass>${sign.storepass}</storepass>
+ <keypass>${sign.keypass}</keypass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.pyx4me</groupId>
+ <artifactId>proguard-maven-plugin</artifactId>
+ <version>2.0.4</version>
+ <dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>provided</scope>
+ <groupId>net.sf.proguard</groupId>
+ <artifactId>proguard</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
</dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.jayway.maven.plugins.android.generation2</groupId>
- <artifactId>android-maven-plugin</artifactId>
- <version>${android-plugin-version}</version>
- <inherited>true</inherited>
- <configuration>
- <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
- <assetsDirectory>${project.basedir}/assets</assetsDirectory>
- <resourceDirectory>${project.basedir}/res</resourceDirectory>
- <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
- <sdk>
- <platform>${platform}</platform>
- </sdk>
- #if(${emulator} != "not-specified")
- <emulator>
- <avd>${emulator}</avd>
- </emulator>
- #end
- <undeployBeforeDeploy>true</undeployBeforeDeploy>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <version>1.2</version>
- <inherited>true</inherited>
- <configuration>
- <removeExistingSignatures>true</removeExistingSignatures>
- <archiveDirectory />
- <archive>${project.build.directory}/${project.build.finalName}.${project.packaging}</archive>
- <verbose>true</verbose>
- <certs>true</certs>
- <keystore>${sign.keystore}</keystore>
- <alias>${sign.alias}</alias>
- <storepass>${sign.storepass}</storepass>
- <keypass>${sign.keypass}</keypass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.pyx4me</groupId>
- <artifactId>proguard-maven-plugin</artifactId>
- <version>2.0.4</version>
- <dependencies>
- <dependency>
- <groupId>net.sf.proguard</groupId>
- <artifactId>proguard</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <configuration>
- <proguardVersion>4.4</proguardVersion>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ </dependencies>
+ <configuration>
+ <proguardVersion>4.4</proguardVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <profiles>
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-signing-properties</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>sign.keystore</property>
- <message>The 'sign.keystore' property is missing. It must contain the path to the
- keystore used to sign the application.</message>
- </requireProperty>
- <requireFilesExist>
- <files>
- <file>${sign.keystore}</file>
- </files>
- <message>The 'sign.keystore' property does not point to a file. It must contain the
- path to the keystore used to sign the application.</message>
- </requireFilesExist>
- <requireProperty>
- <property>sign.alias</property>
- <message>The 'sign.alias' property is missing. It must contain the key alias used to
- sign the application.</message>
- </requireProperty>
- <requireProperty>
- <property>sign.storepass</property>
- <message>The 'sign.storepass' property is missing. It must contain the password of
- the keystore used to sign the application.
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-signing-properties</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>sign.keystore</property>
+ <message>The 'sign.keystore' property is missing. It must contain the path to the
+ keystore used to sign the application.
+ </message>
+ </requireProperty>
+ <requireFilesExist>
+ <files>
+ <file>${sign.keystore}</file>
+ </files>
+ <message>The 'sign.keystore' property does not point to a file. It must contain the
+ path to the keystore used to sign the application.
+ </message>
+ </requireFilesExist>
+ <requireProperty>
+ <property>sign.alias</property>
+ <message>The 'sign.alias' property is missing. It must contain the key alias used to
+ sign the application.
+ </message>
+ </requireProperty>
+ <requireProperty>
+ <property>sign.storepass</property>
+ <message>The 'sign.storepass' property is missing. It must contain the password of
+ the keystore used to sign the application.
+ </message>
+ </requireProperty>
+ <requireProperty>
+ <property>sign.keypass</property>
+ <message>The 'sign.keypass' property is missing. It must contain the password of the
+ key used to sign the application.
</message>
- </requireProperty>
- <requireProperty>
- <property>sign.keypass</property>
- <message>The 'sign.keypass' property is missing. It must contain the password of the
- key used to sign the application.</message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>linux</id>
- <activation>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <properties>
- <rt.jar.path>${java.home}/jre/lib/rt.jar</rt.jar.path>
- <jsse.jar.path>${java.home}/jre/lib/jsse.jar</jsse.jar.path>
- </properties>
- </profile>
- <!-- mac profile has to be after unix since running on mac will trigger both -->
- <profile>
- <id>mac</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <!-- absolute path -->
- <!--<rt.jar.path>/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar</rt.jar.path> -->
- <!-- or with JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/ -->
- <rt.jar.path>${java.home}/../Classes/classes.jar</rt.jar.path>
- <jsse.jar.path>${java.home}/../Classes/jsse.jar</jsse.jar.path>
- </properties>
- </profile>
- <profile>
- <id>windows</id>
- <activation>
- <os>
- <family>windows</family>
- </os>
- </activation>
- <properties>
- <rt.jar.path>${java.home}/jre/lib/rt.jar</rt.jar.path>
- <jsse.jar.path>${java.home}/jre/lib/jsse.jar</jsse.jar.path>
- </properties>
- </profile>
- </profiles>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>linux</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <properties>
+ <rt.jar.path>${java.home}/jre/lib/rt.jar</rt.jar.path>
+ <jsse.jar.path>${java.home}/jre/lib/jsse.jar</jsse.jar.path>
+ </properties>
+ </profile>
+ <!-- mac profile has to be after unix since running on mac will trigger both -->
+ <profile>
+ <id>mac</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <!-- absolute path -->
+ <!--<rt.jar.path>/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar</rt.jar.path> -->
+ <!-- or with JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/ -->
+ <rt.jar.path>${java.home}/../Classes/classes.jar</rt.jar.path>
+ <jsse.jar.path>${java.home}/../Classes/jsse.jar</jsse.jar.path>
+ </properties>
+ </profile>
+ <profile>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <rt.jar.path>${java.home}/jre/lib/rt.jar</rt.jar.path>
+ <jsse.jar.path>${java.home}/jre/lib/jsse.jar</jsse.jar.path>
+ </properties>
+ </profile>
+ </profiles>
</project>
View
4 android-with-test/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,13 +5,13 @@
<requiredProperties>
<requiredProperty key="platform">
- <defaultValue>10</defaultValue>
+ <defaultValue>16</defaultValue>
</requiredProperty>
<requiredProperty key="emulator">
<defaultValue>not-specified</defaultValue>
</requiredProperty>
<requiredProperty key="android-plugin-version">
- <defaultValue>3.1.1</defaultValue>
+ <defaultValue>3.3.0</defaultValue>
</requiredProperty>
</requiredProperties>
View
135 android-with-test/src/main/resources/archetype-resources/__rootArtifactId__-it/pom.xml
@@ -1,75 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}-parent</artifactId>
- <version>${version}</version>
- </parent>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>${groupId}</groupId>
- <artifactId>${artifactId}-it</artifactId>
+ <artifactId>${rootArtifactId}-parent</artifactId>
<version>${version}</version>
- <packaging>apk</packaging>
- <name>${artifactId} - Integration tests</name>
+ </parent>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-it</artifactId>
+ <version>${version}</version>
+ <packaging>apk</packaging>
+ <name>${artifactId} - Integration tests</name>
- <dependencies>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android-test</artifactId>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <type>apk</type>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <type>jar</type>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.jayway.maven.plugins.android.generation2</groupId>
- <artifactId>android-maven-plugin</artifactId>
- <configuration>
- <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
- <assetsDirectory>${project.basedir}/assets</assetsDirectory>
- <resourceDirectory>${project.basedir}/res</resourceDirectory>
- <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
- <sdk>
- <platform>${platform}</platform>
- </sdk>
- #if(${emulator} != "not-specified")
- <emulator>
- <avd>${emulator}</avd>
- </emulator>
- #end
- <undeployBeforeDeploy>true</undeployBeforeDeploy>
- </configuration>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android-test</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <type>apk</type>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <type>jar</type>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <configuration>
+ <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
+ <assetsDirectory>${project.basedir}/assets</assetsDirectory>
+ <resourceDirectory>${project.basedir}/res</resourceDirectory>
+ <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
+ <sdk>
+ <platform>${platform}</platform>
+ </sdk>
+ #if(${emulator} != "not-specified")
+ <emulator>
+ <avd>${emulator}</avd>
+ </emulator>
+ #end
+ <undeployBeforeDeploy>true</undeployBeforeDeploy>
+ </configuration>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
View
130 android-with-test/src/main/resources/archetype-resources/pom.xml
@@ -1,73 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-parent</artifactId>
- <version>${version}</version>
- <packaging>pom</packaging>
- <name>${artifactId} - Parent</name>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}-parent</artifactId>
+ <version>${version}</version>
+ <packaging>pom</packaging>
+ <name>${artifactId} - Parent</name>
- <modules>
- <module>${rootArtifactId}</module>
- <module>${rootArtifactId}-it</module>
- </modules>
+ <modules>
+ <module>${rootArtifactId}</module>
+ <module>${rootArtifactId}-it</module>
+ </modules>
- <properties>
- <platform.version>#if(${platform} == 3) 1.5_r4
- #elseif(${platform} == 4) 1.6_r2
- #elseif(${platform} == 7) 2.1.2
- #elseif(${platform} == 8) 2.2.1
- #elseif(${platform} == 9) 2.3.1
- #elseif(${platform} == 10) 2.3.3
- #{else} 4.0.1.2
- #end</platform.version>
- </properties>
+ <properties>
+ <platform.version>#if(${platform} == 3) 1.5_r4
+ #elseif(${platform} == 4) 1.6_r2
+ #elseif(${platform} == 7) 2.1.2
+ #elseif(${platform} == 8) 2.2.1
+ #elseif(${platform} == 9) 2.3.1
+ #elseif(${platform} == 10) 2.3.3
+ #elseif(${platform} == 14) 4.0.1.2
+ #elseif(${platform} == 16) 4.1.1.4
+ #end
+ </platform.version>
+ </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.android</groupId>
- <artifactId>android-test</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.android</groupId>
+ <artifactId>android-test</artifactId>
+ <version>${platform.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Androlog is a logging and reporting library for Android -->
- <dependency>
- <groupId>de.akquinet.android.androlog</groupId>
- <artifactId>androlog</artifactId>
- <version>1.0.5</version>
- </dependency>
+ <!-- Androlog is a logging and reporting library for Android -->
+ <dependency>
+ <groupId>de.akquinet.android.androlog</groupId>
+ <artifactId>androlog</artifactId>
+ <version>1.0.5</version>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.jayway.maven.plugins.android.generation2</groupId>
- <artifactId>android-maven-plugin</artifactId>
- <version>${android-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>${android-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Something went wrong with that request. Please try again.