diff --git a/calculatorpp-core/pom.xml b/calculatorpp-core/pom.xml index 9625a094..4a7a31b3 100644 --- a/calculatorpp-core/pom.xml +++ b/calculatorpp-core/pom.xml @@ -7,12 +7,12 @@ org.solovyev.android calculatorpp-parent - 1.4.3-b1 + 1.4.3-b1-SNAPSHOT org.solovyev.android calculatorpp-core - 1.4.3-b1 + 1.4.3-b1-SNAPSHOT Calculator++ Application Core jar diff --git a/calculatorpp-test/pom.xml b/calculatorpp-test/pom.xml index dcba83d4..2a0b32d0 100644 --- a/calculatorpp-test/pom.xml +++ b/calculatorpp-test/pom.xml @@ -6,7 +6,7 @@ org.solovyev.android calculatorpp-parent - 1.4.3-b1 + 1.4.3-b1-SNAPSHOT 4.0.0 diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml index 8856f09e..144d1afe 100644 --- a/calculatorpp/AndroidManifest.xml +++ b/calculatorpp/AndroidManifest.xml @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/calculatorpp/pom.xml b/calculatorpp/pom.xml index aa2ed88f..0721a157 100644 --- a/calculatorpp/pom.xml +++ b/calculatorpp/pom.xml @@ -6,7 +6,7 @@ org.solovyev.android calculatorpp-parent - 1.4.3-b1 + 1.4.3-b1-SNAPSHOT 4.0.0 @@ -23,7 +23,7 @@ org.solovyev.android calculatorpp-core - 1.4.3-b1 + 1.4.3-b1-SNAPSHOT @@ -38,47 +38,10 @@ org.solovyev.android - android-common-core + android-common-all apklib - - org.solovyev.android - android-common-ads - apklib - - - - org.solovyev.android - android-common-view - apklib - - - - org.solovyev.android - android-common-preferences - apklib - - - - org.solovyev.android - android-common-other - apklib - - - - org.solovyev.android - android-common-menu - apklib - - - - org.solovyev.android - android-common-sherlock - apklib - - - org.solovyev jscl @@ -139,13 +102,6 @@ 6.1.0 - - org.solovyev.android - billing - 0.2 - apklib - - com.google.guava guava diff --git a/calculatorpp/project.properties b/calculatorpp/project.properties index 03180409..eac58e67 100644 --- a/calculatorpp/project.properties +++ b/calculatorpp/project.properties @@ -1,24 +1,24 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-15 -android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.0 -android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.0 -android.library.reference.3=gen-external-apklibs/org.solovyev.android_billing_0.2 -android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.0 -android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.0 -android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.0 -android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.0 -android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.0 -android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.0 -android.library.reference.10=gen-external-apklibs/com.actionbarsherlock_library_4.1.0 -android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.0 - - +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +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.4-SNAPSHOT +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.4-SNAPSHOT +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.4-SNAPSHOT +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.4-SNAPSHOT +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_actionbarsherlock_4.2.0 +android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.4-SNAPSHOT + + diff --git a/pom.xml b/pom.xml index 89049abf..6624e1c1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,13 +14,13 @@ org.solovyev.android calculatorpp-parent pom - 1.4.3-b1 + 1.4.3-b1-SNAPSHOT Calculator++ scm:git:git@github.com:serso/android-calculatorpp.git scm:git:git@github.com:serso/android-calculatorpp.git - git@github.com:serso/android-calculatorpp.git + http://github.com/serso/android-calculatorpp @@ -31,6 +31,8 @@ UTF-8 + 1.0.4 + 1.0.1 @@ -39,61 +41,90 @@ org.solovyev common-core - 1.0.0 + ${common.version} org.solovyev common-text - 1.0.1 + ${common.version} org.solovyev.android android-common-core apklib - 1.0.2 + ${android.common.version} org.solovyev.android android-common-ads apklib - 1.0.2 + ${android.common.version} org.solovyev.android android-common-view apklib - 1.0.2 + ${android.common.version} org.solovyev.android android-common-preferences apklib - 1.0.2 + ${android.common.version} org.solovyev.android android-common-menu apklib - 1.0.2 + ${android.common.version} + + + + org.solovyev.android + android-common-db + apklib + ${android.common.version} org.solovyev.android android-common-sherlock - 1.0.2 + ${android.common.version} apklib + + org.solovyev.android + android-common-other + apklib + ${android.common.version} + + + + org.solovyev.android + android-common-billing + apklib + ${android.common.version} + + + + org.solovyev.android + android-common-all + apklib + ${android.common.version} + + + com.actionbarsherlock library - 4.1.0 + 4.2.0 apklib @@ -114,13 +145,6 @@ - - org.solovyev.android - android-common-other - apklib - 1.0.0 - - junit junit @@ -208,6 +232,15 @@ + + org.apache.maven.plugins + maven-release-plugin + 2.3.2 + + release-@{project.version} + + +