POM changes
This commit is contained in:
parent
98a38319eb
commit
cf9a609d6b
@ -1,19 +1,20 @@
|
|||||||
# This file is automatically generated by Android Tools.
|
# This file is automatically generated by Android Tools.
|
||||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||||
#
|
#
|
||||||
# This file must be checked in Version Control Systems.
|
# This file must be checked in Version Control Systems.
|
||||||
#
|
#
|
||||||
# To customize properties used by the Ant build system use,
|
# To customize properties used by the Ant build system use,
|
||||||
# "ant.properties", and override values to adapt the script to your
|
# "ant.properties", and override values to adapt the script to your
|
||||||
# project structure.
|
# project structure.
|
||||||
|
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-15
|
target=android-15
|
||||||
android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
|
android.library.reference.1=../calculatorpp-service
|
||||||
android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
|
android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0
|
||||||
android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
|
android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0
|
||||||
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
|
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0
|
||||||
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
|
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0
|
||||||
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0
|
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0
|
||||||
|
android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0
|
||||||
|
|
||||||
|
|
||||||
|
444
pom.xml
444
pom.xml
@ -1,227 +1,219 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>calculatorpp-parent</artifactId>
|
<artifactId>calculatorpp-parent</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.3.1</version>
|
<version>1.3.1</version>
|
||||||
<name>Calculator++</name>
|
<name>Calculator++</name>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>calculatorpp</module>
|
<module>calculatorpp</module>
|
||||||
<module>calculatorpp-service</module>
|
<module>calculatorpp-service</module>
|
||||||
<module>calculatorpp-test</module>
|
<module>calculatorpp-test</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev</groupId>
|
<groupId>org.solovyev</groupId>
|
||||||
<artifactId>common-core</artifactId>
|
<artifactId>common-core</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev</groupId>
|
<groupId>org.solovyev</groupId>
|
||||||
<artifactId>common-text</artifactId>
|
<artifactId>common-text</artifactId>
|
||||||
<version>1.0.1</version>
|
<version>1.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>android-common-core</artifactId>
|
<artifactId>android-common-core</artifactId>
|
||||||
<type>apklib</type>
|
<type>apklib</type>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>android-common-ads</artifactId>
|
<artifactId>android-common-ads</artifactId>
|
||||||
<type>apklib</type>
|
<type>apklib</type>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>android-common-view</artifactId>
|
<artifactId>android-common-view</artifactId>
|
||||||
<type>apklib</type>
|
<type>apklib</type>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>android-common-preferences</artifactId>
|
<artifactId>android-common-preferences</artifactId>
|
||||||
<type>apklib</type>
|
<type>apklib</type>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>android-common-menu</artifactId>
|
<artifactId>android-common-menu</artifactId>
|
||||||
<type>apklib</type>
|
<type>apklib</type>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.solovyev.android</groupId>
|
<groupId>org.solovyev.android</groupId>
|
||||||
<artifactId>android-common-other</artifactId>
|
<artifactId>android-common-other</artifactId>
|
||||||
<type>apklib</type>
|
<type>apklib</type>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
<version>4.8.1</version>
|
<version>4.8.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.android</groupId>
|
<groupId>com.google.android</groupId>
|
||||||
<artifactId>android</artifactId>
|
<artifactId>android</artifactId>
|
||||||
<version>4.0.1.2</version>
|
<version>4.0.1.2</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.android</groupId>
|
<groupId>com.google.android</groupId>
|
||||||
<artifactId>android-test</artifactId>
|
<artifactId>android-test</artifactId>
|
||||||
<version>2.3.1</version>
|
<version>2.3.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>11.0.2</version>
|
<version>11.0.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<groupId>com.electriccloud</groupId>
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<artifactId>javac2-maven-plugin</artifactId>
|
||||||
<extensions>true</extensions>
|
<version>1.0.1</version>
|
||||||
|
<executions>
|
||||||
<configuration>
|
<execution>
|
||||||
<manifest>
|
<id>@NotNull Instrumentation</id>
|
||||||
<debuggable>true</debuggable>
|
<goals>
|
||||||
</manifest>
|
<goal>instrument</goal>
|
||||||
</configuration>
|
</goals>
|
||||||
|
<!--compile phase instead of process-classes because of proguard.
|
||||||
<executions>
|
@NotNull instrumentation will be done now after compilation and before proguard-->
|
||||||
|
<phase>compile</phase>
|
||||||
<execution>
|
</execution>
|
||||||
<id>manifestUpdate</id>
|
</executions>
|
||||||
<phase>process-resources</phase>
|
</plugin>
|
||||||
<goals>
|
|
||||||
<goal>manifest-update</goal>
|
</plugins>
|
||||||
</goals>
|
|
||||||
</execution>
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
</executions>
|
|
||||||
|
<plugin>
|
||||||
</plugin>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||||
</plugins>
|
<version>1.2</version>
|
||||||
|
</plugin>
|
||||||
<pluginManagement>
|
|
||||||
<plugins>
|
<plugin>
|
||||||
|
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||||
<plugin>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<version>3.1.1</version>
|
||||||
<artifactId>maven-jarsigner-plugin</artifactId>
|
<configuration>
|
||||||
<version>1.2</version>
|
|
||||||
</plugin>
|
<sourceDirectories>
|
||||||
|
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
|
||||||
<plugin>
|
</sourceDirectories>
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<sdk>
|
||||||
<version>3.1.1</version>
|
<platform>15</platform>
|
||||||
<configuration>
|
</sdk>
|
||||||
|
|
||||||
<sourceDirectories>
|
<emulator>
|
||||||
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
|
<avd>23</avd>
|
||||||
</sourceDirectories>
|
<wait>10000</wait>
|
||||||
|
<!--<options>-no-skin</options>-->
|
||||||
<sdk>
|
</emulator>
|
||||||
<platform>15</platform>
|
|
||||||
</sdk>
|
<zipalign>
|
||||||
|
<verbose>true</verbose>
|
||||||
<emulator>
|
</zipalign>
|
||||||
<avd>23</avd>
|
|
||||||
<wait>10000</wait>
|
<undeployBeforeDeploy>true</undeployBeforeDeploy>
|
||||||
<!--<options>-no-skin</options>-->
|
|
||||||
</emulator>
|
</configuration>
|
||||||
|
|
||||||
<zipalign>
|
</plugin>
|
||||||
<verbose>true</verbose>
|
|
||||||
</zipalign>
|
<plugin>
|
||||||
|
<groupId>com.pyx4me</groupId>
|
||||||
<undeployBeforeDeploy>true</undeployBeforeDeploy>
|
<artifactId>proguard-maven-plugin</artifactId>
|
||||||
|
<version>2.0.4</version>
|
||||||
</configuration>
|
</plugin>
|
||||||
|
|
||||||
</plugin>
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<plugin>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
<groupId>com.pyx4me</groupId>
|
<version>1.5</version>
|
||||||
<artifactId>proguard-maven-plugin</artifactId>
|
</plugin>
|
||||||
<version>2.0.4</version>
|
|
||||||
</plugin>
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<extensions>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<extension>
|
||||||
<version>1.5</version>
|
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||||
</plugin>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
|
<version>3.1.1</version>
|
||||||
</plugins>
|
</extension>
|
||||||
</pluginManagement>
|
</extensions>
|
||||||
|
|
||||||
<extensions>
|
</build>
|
||||||
<extension>
|
|
||||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
<profiles>
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
|
||||||
<version>3.1.1</version>
|
<profile>
|
||||||
</extension>
|
<!-- the standard profile runs instrumentation tests -->
|
||||||
</extensions>
|
<id>standard</id>
|
||||||
|
</profile>
|
||||||
</build>
|
|
||||||
|
<profile>
|
||||||
<profiles>
|
<!-- the release profile does sign, proguard, zipalign -->
|
||||||
|
<id>release</id>
|
||||||
<profile>
|
<!-- via this activation the profile is automatically used when the release is done with the maven release
|
||||||
<!-- the standard profile runs instrumentation tests -->
|
plugin -->
|
||||||
<id>standard</id>
|
<activation>
|
||||||
</profile>
|
<property>
|
||||||
|
<name>performRelease</name>
|
||||||
<profile>
|
<value>true</value>
|
||||||
<!-- the release profile does sign, proguard, zipalign -->
|
</property>
|
||||||
<id>release</id>
|
</activation>
|
||||||
<!-- via this activation the profile is automatically used when the release is done with the maven release
|
|
||||||
plugin -->
|
</profile>
|
||||||
<activation>
|
</profiles>
|
||||||
<property>
|
|
||||||
<name>performRelease</name>
|
|
||||||
<value>true</value>
|
|
||||||
</property>
|
|
||||||
</activation>
|
|
||||||
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
Loading…
Reference in New Issue
Block a user