From 53a2b84f510479a3f8029a41ba3fdfb5ef11f062 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Fri, 30 Nov 2012 18:07:20 +0400 Subject: [PATCH] changes --- android-app-core/AndroidManifest.xml | 6 ++++ android-app-widget/AndroidManifest.xml | 6 ++++ android-app-widget/pom.xml | 3 +- .../org/solovyev/android/ads/BuildConfig.java | 6 ---- .../net/robotmedia/billing/BuildConfig.java | 6 ---- .../solovyev/android/core/BuildConfig.java | 6 ---- .../org/solovyev/android/db/BuildConfig.java | 6 ---- .../solovyev/android/http/BuildConfig.java | 6 ---- .../android/keyboard/BuildConfig.java | 6 ---- .../solovyev/android/list/BuildConfig.java | 6 ---- .../solovyev/android/menu/BuildConfig.java | 6 ---- .../solovyev/android/other/BuildConfig.java | 6 ---- .../solovyev/android/prefs/BuildConfig.java | 6 ---- .../solovyev/android/view/BuildConfig.java | 6 ---- android-app/pom.xml | 9 +++++- android-app/project.properties | 30 ++++++++++--------- core/pom.xml | 2 +- pom.xml | 10 ++++++- 18 files changed, 48 insertions(+), 84 deletions(-) create mode 100644 android-app-core/AndroidManifest.xml create mode 100644 android-app-widget/AndroidManifest.xml delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6/gen/org/solovyev/android/ads/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6/gen/net/robotmedia/billing/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6/gen/org/solovyev/android/core/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6/gen/org/solovyev/android/db/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6/gen/org/solovyev/android/http/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6/gen/org/solovyev/android/keyboard/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6/gen/org/solovyev/android/list/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6/gen/org/solovyev/android/menu/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6/gen/org/solovyev/android/other/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6/gen/org/solovyev/android/prefs/BuildConfig.java delete mode 100644 android-app/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6/gen/org/solovyev/android/view/BuildConfig.java diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/AndroidManifest.xml new file mode 100644 index 00000000..312325db --- /dev/null +++ b/android-app-core/AndroidManifest.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/android-app-widget/AndroidManifest.xml b/android-app-widget/AndroidManifest.xml new file mode 100644 index 00000000..25df81f1 --- /dev/null +++ b/android-app-widget/AndroidManifest.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/android-app-widget/pom.xml b/android-app-widget/pom.xml index 1482467f..9fa5b134 100644 --- a/android-app-widget/pom.xml +++ b/android-app-widget/pom.xml @@ -24,8 +24,9 @@ - org.solovyev.android.calculator + org.solovyev.android calculatorpp-android-app-core + apklib diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6/gen/org/solovyev/android/ads/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6/gen/org/solovyev/android/ads/BuildConfig.java deleted file mode 100644 index 2cdcc5a6..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6/gen/org/solovyev/android/ads/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.ads; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6/gen/net/robotmedia/billing/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6/gen/net/robotmedia/billing/BuildConfig.java deleted file mode 100644 index f533bda0..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6/gen/net/robotmedia/billing/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package net.robotmedia.billing; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6/gen/org/solovyev/android/core/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6/gen/org/solovyev/android/core/BuildConfig.java deleted file mode 100644 index 57d0e993..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6/gen/org/solovyev/android/core/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.core; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6/gen/org/solovyev/android/db/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6/gen/org/solovyev/android/db/BuildConfig.java deleted file mode 100644 index 3acdf88d..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6/gen/org/solovyev/android/db/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.db; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6/gen/org/solovyev/android/http/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6/gen/org/solovyev/android/http/BuildConfig.java deleted file mode 100644 index bac2bc3b..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6/gen/org/solovyev/android/http/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.http; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6/gen/org/solovyev/android/keyboard/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6/gen/org/solovyev/android/keyboard/BuildConfig.java deleted file mode 100644 index 8d7e42e5..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6/gen/org/solovyev/android/keyboard/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.keyboard; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6/gen/org/solovyev/android/list/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6/gen/org/solovyev/android/list/BuildConfig.java deleted file mode 100644 index f7f63a43..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6/gen/org/solovyev/android/list/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.list; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6/gen/org/solovyev/android/menu/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6/gen/org/solovyev/android/menu/BuildConfig.java deleted file mode 100644 index 506cda16..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6/gen/org/solovyev/android/menu/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.menu; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6/gen/org/solovyev/android/other/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6/gen/org/solovyev/android/other/BuildConfig.java deleted file mode 100644 index e3bddf1c..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6/gen/org/solovyev/android/other/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.other; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6/gen/org/solovyev/android/prefs/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6/gen/org/solovyev/android/prefs/BuildConfig.java deleted file mode 100644 index 90f5ceeb..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6/gen/org/solovyev/android/prefs/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.prefs; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6/gen/org/solovyev/android/view/BuildConfig.java b/android-app/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6/gen/org/solovyev/android/view/BuildConfig.java deleted file mode 100644 index 4cc1a99f..00000000 --- a/android-app/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6/gen/org/solovyev/android/view/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package org.solovyev.android.view; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/android-app/pom.xml b/android-app/pom.xml index ae367212..40283d01 100644 --- a/android-app/pom.xml +++ b/android-app/pom.xml @@ -24,8 +24,15 @@ - org.solovyev.android.calculator + org.solovyev.android calculatorpp-android-app-core + apklib + + + + org.solovyev.android + calculatorpp-android-app-widget + apklib diff --git a/android-app/project.properties b/android-app/project.properties index a00e8017..41cc5058 100644 --- a/android-app/project.properties +++ b/android-app/project.properties @@ -9,19 +9,21 @@ # Project target. target=android-15 -android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6 -android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6 -android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6 -android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6 -android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6 -android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6 -android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6 -android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6 -android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6 -android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6 -android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6 -android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6 -android.library.reference.13=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0 -android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6 +android.library.reference.1=../android-app-core +android.library.reference.2=../android-app-widget +android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6 +android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6 +android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6 +android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6 +android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6 +android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6 +android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6 +android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6 +android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6 +android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6 +android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6 +android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6 +android.library.reference.15=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0 +android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6 diff --git a/core/pom.xml b/core/pom.xml index 79a47275..55a1ae37 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -11,7 +11,7 @@ org.solovyev.android calculatorpp-core 1.5.3-SNAPSHOT - Calculator++ Application Core + Calculator++ Core jar diff --git a/pom.xml b/pom.xml index 63aa0983..3808b754 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,17 @@ - org.solovyev.android.calculator + org.solovyev.android calculatorpp-android-app-core 1.5.3-SNAPSHOT + apklib + + + + org.solovyev.android + calculatorpp-android-app-widget + 1.5.3-SNAPSHOT + apklib