diff --git a/android-app/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar b/android-app/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
deleted file mode 100644
index f95e90eb..00000000
Binary files a/android-app/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar and /dev/null differ
diff --git a/android-app/misc/lib/achartengine-0.7.0.jar b/android-app/misc/lib/achartengine-0.7.0.jar
deleted file mode 100644
index f9e3b830..00000000
Binary files a/android-app/misc/lib/achartengine-0.7.0.jar and /dev/null differ
diff --git a/android-app/misc/lib/achartengine-0.7.1.jar b/android-app/misc/lib/achartengine-0.7.1.jar
deleted file mode 100644
index 78c17e80..00000000
Binary files a/android-app/misc/lib/achartengine-0.7.1.jar and /dev/null differ
diff --git a/android-app/misc/lib/arity-2.1.6.jar b/android-app/misc/lib/arity-2.1.6.jar
deleted file mode 100755
index ec3f021d..00000000
Binary files a/android-app/misc/lib/arity-2.1.6.jar and /dev/null differ
diff --git a/android-app/pom.xml b/android-app/pom.xml
index 05f5f32e..4ad3aa3f 100644
--- a/android-app/pom.xml
+++ b/android-app/pom.xml
@@ -105,12 +105,6 @@
simple-xml
-
- admob
- admob
- 6.1.0
-
-
com.google.guava
guava
diff --git a/android-app/project.properties b/android-app/project.properties
index d1faeda0..7382ccd3 100644
--- a/android-app/project.properties
+++ b/android-app/project.properties
@@ -13,22 +13,22 @@ target=android-17
android.library.reference.1=../android-app-core
android.library.reference.2=../android-app-widget
android.library.reference.3=../android-app-onscreen
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.1.1
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.1.1
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.1.1
-android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.1.1
-android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.1.1
-android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-security_1.1.1
-android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-http_1.1.1
-android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-lists_1.1.1
-android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-views_1.1.1
-android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.1.1
-android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-menus_1.1.1
-android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-other_1.1.1
-android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.1.1
+android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.1.3-SNAPSHOT
+android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.1.3-SNAPSHOT
+android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.1.3-SNAPSHOT
+android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.1.3-SNAPSHOT
+android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.1.3-SNAPSHOT
+android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-security_1.1.3-SNAPSHOT
+android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-http_1.1.3-SNAPSHOT
+android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-lists_1.1.3-SNAPSHOT
+android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-views_1.1.3-SNAPSHOT
+android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.1.3-SNAPSHOT
+android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-menus_1.1.3-SNAPSHOT
+android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-other_1.1.3-SNAPSHOT
+android.library.reference.16=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.1.3-SNAPSHOT
android.library.reference.17=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
-android.library.reference.18=gen-external-apklibs/org.solovyev.android_android-common-keyboards_1.1.1
-android.library.reference.19=gen-external-apklibs/org.solovyev.android_android-common-app_1.1.1
-android.library.reference.20=gen-external-apklibs/org.solovyev.android_android-common-networks_1.1.1
-android.library.reference.21=gen-external-apklibs/org.solovyev.android_android-common-fragments_1.1.1
-android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.1
\ No newline at end of file
+android.library.reference.18=gen-external-apklibs/org.solovyev.android_android-common-keyboards_1.1.3-SNAPSHOT
+android.library.reference.19=gen-external-apklibs/org.solovyev.android_android-common-app_1.1.3-SNAPSHOT
+android.library.reference.20=gen-external-apklibs/org.solovyev.android_android-common-networks_1.1.3-SNAPSHOT
+android.library.reference.21=gen-external-apklibs/org.solovyev.android_android-common-fragments_1.1.3-SNAPSHOT
+android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.3-SNAPSHOT
\ No newline at end of file
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
index f03a4dd5..82ea975f 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
@@ -163,7 +163,7 @@ public class CalculatorApplication extends android.app.Application implements Sh
BillingDB.init(CalculatorApplication.this);
- AdsController.getInstance().init(ADMOB_USER_ID, AD_FREE_PRODUCT_ID, new BillingController.IConfiguration() {
+ AdsController.getInstance().init(this, ADMOB_USER_ID, AD_FREE_PRODUCT_ID, new BillingController.IConfiguration() {
@Override
public byte[] getObfuscationSalt() {
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/plot/FPS.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/FPS.java
deleted file mode 100755
index 74365fa4..00000000
--- a/android-app/src/main/java/org/solovyev/android/calculator/plot/FPS.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2013 serso aka se.solovyev
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Contact details
- *
- * Email: se.solovyev@gmail.com
- * Site: http://se.solovyev.org
- */
-
-package org.solovyev.android.calculator.plot;
-
-class FPS {
- private int drawCnt;
- private long lastTime;
- private int fps;
-
- boolean incFrame() {
- if (--drawCnt > 0) {
- return false;
- }
- drawCnt = 100;
- long now = System.currentTimeMillis();
- fps = Math.round(100000f / (now - lastTime));
- lastTime = now;
- return true;
- }
-
- int getValue() {
- return fps;
- }
-}
diff --git a/pom.xml b/pom.xml
index 0e3104d7..4b2140d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,9 +55,9 @@
UTF-8
- 1.1.1
- 1.0.5
- 1.0.5
+ 1.1.3-SNAPSHOT
+ 1.0.6-SNAPSHOT
+ 1.0.7