TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pom changes

Browse Source
This commit is contained in:
Sergey Solovyev 2012-10-22 00:03:40 +04:00
parent a48c050969
commit 904a09ce76
6 changed files with 83 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calculatorpp-core/pom.xml
View File

@ -7,12 +7,12 @@
<parent> <parent>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-parent</artifactId> <artifactId>calculatorpp-parent</artifactId>
<version>1.4.3-b1</version> <version>1.4.3-b1-SNAPSHOT</version>
</parent> </parent>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-core</artifactId> <artifactId>calculatorpp-core</artifactId>
<version>1.4.3-b1</version> <version>1.4.3-b1-SNAPSHOT</version>
<name>Calculator++ Application Core</name> <name>Calculator++ Application Core</name>
<packaging>jar</packaging> <packaging>jar</packaging>

2
calculatorpp-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-parent</artifactId> <artifactId>calculatorpp-parent</artifactId>
<version>1.4.3-b1</version> <version>1.4.3-b1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
calculatorpp/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="103" android:versionName="1.4.3-b" package="org.solovyev.android.calculator"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="103" android:versionName="1.4.3-b1" package="org.solovyev.android.calculator">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
@ -9,7 +9,7 @@
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
<application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme"> <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme">
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan"> <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">

50
calculatorpp/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-parent</artifactId> <artifactId>calculatorpp-parent</artifactId>
<version>1.4.3-b1</version> <version>1.4.3-b1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-core</artifactId> <artifactId>calculatorpp-core</artifactId>
<version>1.4.3-b1</version> <version>1.4.3-b1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@ -38,47 +38,10 @@
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>android-common-core</artifactId> <artifactId>android-common-all</artifactId>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-ads</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-view</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-preferences</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-other</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-menu</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-sherlock</artifactId>
<type>apklib</type>
</dependency>
<dependency> <dependency>
<groupId>org.solovyev</groupId> <groupId>org.solovyev</groupId>
<artifactId>jscl</artifactId> <artifactId>jscl</artifactId>
@ -139,13 +102,6 @@
<version>6.1.0</version> <version>6.1.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>billing</artifactId>
<version>0.2</version>
<type>apklib</type>
</dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>

48
calculatorpp/project.properties
View File

@ -1,24 +1,24 @@
# 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=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.4-SNAPSHOT
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-ads_1.0.4-SNAPSHOT
android.library.reference.3=gen-external-apklibs/org.solovyev.android_billing_0.2 android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.4-SNAPSHOT
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.0 android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.4-SNAPSHOT
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0 android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.4-SNAPSHOT
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0 android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.4-SNAPSHOT
android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0 android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.4-SNAPSHOT
android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0 android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.4-SNAPSHOT
android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.0 android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.4-SNAPSHOT
android.library.reference.10=gen-external-apklibs/com.actionbarsherlock_library_4.1.0 android.library.reference.10=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.0 android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.4-SNAPSHOT

69
pom.xml
View File

@ -14,13 +14,13 @@
<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.4.3-b1</version> <version>1.4.3-b1-SNAPSHOT</version>
<name>Calculator++</name> <name>Calculator++</name>
<scm> <scm>
<connection>scm:git:git@github.com:serso/android-calculatorpp.git</connection> <connection>scm:git:git@github.com:serso/android-calculatorpp.git</connection>
<developerConnection>scm:git:git@github.com:serso/android-calculatorpp.git</developerConnection> <developerConnection>scm:git:git@github.com:serso/android-calculatorpp.git</developerConnection>
<url>git@github.com:serso/android-calculatorpp.git</url> <url>http://github.com/serso/android-calculatorpp</url>
</scm> </scm>
<modules> <modules>
@ -31,6 +31,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<android.common.version>1.0.4</android.common.version>
<common.version>1.0.1</common.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -39,61 +41,90 @@
<dependency> <dependency>
<groupId>org.solovyev</groupId> <groupId>org.solovyev</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<version>1.0.0</version> <version>${common.version}</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>${common.version}</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.2</version> <version>${android.common.version}</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.2</version> <version>${android.common.version}</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.2</version> <version>${android.common.version}</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.2</version> <version>${android.common.version}</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.2</version> <version>${android.common.version}</version>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-db</artifactId>
<type>apklib</type>
<version>${android.common.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>android-common-sherlock</artifactId> <artifactId>android-common-sherlock</artifactId>
<version>1.0.2</version> <version>${android.common.version}</version>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-other</artifactId>
<type>apklib</type>
<version>${android.common.version}</version>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-billing</artifactId>
<type>apklib</type>
<version>${android.common.version}</version>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-all</artifactId>
<type>apklib</type>
<version>${android.common.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.actionbarsherlock</groupId> <groupId>com.actionbarsherlock</groupId>
<artifactId>library</artifactId> <artifactId>library</artifactId>
<version>4.1.0</version> <version>4.2.0</version>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>
@ -114,13 +145,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-other</artifactId>
<type>apklib</type>
<version>1.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@ -208,6 +232,15 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<tagNameFormat>release-@{project.version}</tagNameFormat>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>