Permalink
Browse files

Merge branch 'master' of github.com:mosabua/maven-android-sdk-deployer

Conflicts:
	README.markdown
  • Loading branch information...
2 parents d1250ea + f8546ad commit 637066dbf58a155e809bc8af556fb15d48229174 @mosabua mosabua committed Mar 19, 2013
View
@@ -319,7 +319,7 @@ For the usb add on
<dependency>
<groupId>com.android.future</groupId>
<artifactId>usb</artifactId>
- <version>17_r1</version>
+ <version>17_r2</version>
<scope>provided</scope>
</dependency>
```
@@ -405,7 +405,7 @@ For the Google AdMob Ads extra (ATTENTION! Do NOT use provided scope!!)
<dependency>
<groupId>com.google.android.admob</groupId>
<artifactId>admob</artifactId>
- <version>6.3.1-r9</version>
+ <version>6.3.1-r10</version>
</dependency>
```
@@ -28,16 +28,28 @@
</dependencies>
<build>
+ <sourceDirectory>${sdk.extras.google.play.services.path}/libproject/google-play-services_lib/src</sourceDirectory>
+
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<resourceDirectory>${sdk.extras.google.play.services.path}/libproject/google-play-services_lib/res/</resourceDirectory>
<androidManifestFile>${sdk.extras.google.play.services.path}/libproject/google-play-services_lib/AndroidManifest.xml</androidManifestFile>
- <sourceDirectory>${sdk.extras.google.play.services.path}/libproject/google-play-services_lib/src</sourceDirectory>
- </configuration>
+ </configuration>
</plugin>
<plugin>
@@ -72,6 +84,8 @@
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>${jar.path}</file>
+ <sources>target/${extras.google.play.services.artifactId}-${project.version}-sources.jar</sources>
+ <javadoc>target/${extras.google.play.services.artifactId}-${project.version}-javadoc.jar</javadoc>
</configuration>
</execution>
<execution>
@@ -104,6 +118,8 @@
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>${jar.path}</file>
+ <sources>target/${extras.google.play.services.artifactId}-${project.version}-sources.jar</sources>
+ <javadoc>target/${extras.google.play.services.artifactId}-${project.version}-javadoc.jar</javadoc>
<url>${repo.url}</url>
<repositoryId>${repo.id}</repositoryId>
</configuration>
@@ -20,27 +20,34 @@
<dependencies>
<dependency>
- <groupId>com.google.android</groupId>
+ <groupId>com.google.android</groupId>
<artifactId>android</artifactId>
- <version>2.3.3</version>
+ <version>4.1.1.4</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.google.android.licensing</groupId>
+ <artifactId>play-licensing</artifactId>
+ <version>2</version>
+ <type>apklib</type>
+ </dependency>
</dependencies>
<build>
+ <sourceDirectory>${sdk.extras.google.play.apk.expansion.path}/downloader_library/src</sourceDirectory>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <resourceDirectory>${sdk.extras.google.play.apk.expansion.path}/downloader_library/res/res/</resourceDirectory>
+ <resourceDirectory>${sdk.extras.google.play.apk.expansion.path}/downloader_library/res/</resourceDirectory>
<androidManifestFile>${sdk.extras.google.play.apk.expansion.path}/downloader_library/AndroidManifest.xml</androidManifestFile>
- <sourceDirectory>${sdk.extras.google.play.apk.expansion.path}/downloader_library/src</sourceDirectory>
- <sdk>
- <platform>10</platform>
- </sdk>
- </configuration>
+ <sdk>
+ <platform>16</platform>
+ </sdk>
+ </configuration>
</plugin>
<plugin>
@@ -64,7 +71,7 @@
<plugin>
<artifactId>maven-install-plugin</artifactId>
<executions>
- <execution>
+ <execution>
<id>jar-file</id>
<phase>install</phase>
<goals><goal>install-file</goal></goals>
@@ -74,6 +81,8 @@
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>target/${extras.google.play.apk.expansion.artifactId}-${project.version}.jar</file>
+ <sources>target/${extras.google.play.apk.expansion.artifactId}-${project.version}-sources.jar</sources>
+ <javadoc>target/${extras.google.play.apk.expansion.artifactId}-${project.version}-javadoc.jar</javadoc>
</configuration>
</execution>
<execution>
@@ -11,37 +11,56 @@
<artifactId>android-extras</artifactId>
<version>2.2.1</version>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
- <file>${sdk.extras.path}/google/play_apk_expansion/source.properties</file>
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${sdk.extras.path}/google/play_apk_expansion/source.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>all</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>zip-file</module>
- <module>downloader-library</module>
+ <module>zip-file</module>
+ <module>downloader-library</module>
</modules>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+ </build>
+
</profile>
</profiles>
</project>
@@ -28,6 +28,7 @@
</dependencies>
<build>
+ <sourceDirectory>${sdk.extras.google.play.apk.expansion.path}/zip_file/src</sourceDirectory>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
@@ -36,8 +37,7 @@
<configuration>
<resourceDirectory>${sdk.extras.google.play.apk.expansion.path}/zip_file/res/</resourceDirectory>
<androidManifestFile>${sdk.extras.google.play.apk.expansion.path}/zip_file/AndroidManifest.xml</androidManifestFile>
- <sourceDirectory>${sdk.extras.google.play.apk.expansion.path}/zip_file/src</sourceDirectory>
- </configuration>
+ </configuration>
</plugin>
<plugin>
@@ -72,6 +72,8 @@
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>target/${extras.google.play.apk.expansion.artifactId}-${project.version}.jar</file>
+ <sources>target/${extras.google.play.apk.expansion.artifactId}-${project.version}-sources.jar</sources>
+ <javadoc>target/${extras.google.play.apk.expansion.artifactId}-${project.version}-javadoc.jar</javadoc>
</configuration>
</execution>
<execution>
View
@@ -30,6 +30,37 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>install</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>install</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<profiles>
View
@@ -163,7 +163,7 @@
</plugins>
</build>
<properties>
- <javadoc.path>${project.build.directory}/android-javadoc.jar</javadoc.path>
+ <javadoc.path>${project.build.directory}/../../target/android-javadoc.jar</javadoc.path>
</properties>
</profile>
</profiles>

0 comments on commit 637066d

Please sign in to comment.