deps version update
This commit is contained in:
parent
572f151d24
commit
21d326b563
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -105,12 +105,6 @@
|
|||||||
<artifactId>simple-xml</artifactId>
|
<artifactId>simple-xml</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>admob</groupId>
|
|
||||||
<artifactId>admob</artifactId>
|
|
||||||
<version>6.1.0</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
|
@ -13,22 +13,22 @@ target=android-17
|
|||||||
android.library.reference.1=../android-app-core
|
android.library.reference.1=../android-app-core
|
||||||
android.library.reference.2=../android-app-widget
|
android.library.reference.2=../android-app-widget
|
||||||
android.library.reference.3=../android-app-onscreen
|
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.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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.1
|
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.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.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.1
|
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.1
|
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.1
|
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.1
|
android.library.reference.22=gen-external-apklibs/org.solovyev.android_android-common-tasks_1.1.3-SNAPSHOT
|
@ -163,7 +163,7 @@ public class CalculatorApplication extends android.app.Application implements Sh
|
|||||||
|
|
||||||
BillingDB.init(CalculatorApplication.this);
|
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
|
@Override
|
||||||
public byte[] getObfuscationSalt() {
|
public byte[] getObfuscationSalt() {
|
||||||
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
6
pom.xml
6
pom.xml
@ -55,9 +55,9 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<acl.version>1.1.1</acl.version>
|
<acl.version>1.1.3-SNAPSHOT</acl.version>
|
||||||
<jcl.version>1.0.5</jcl.version>
|
<jcl.version>1.0.6-SNAPSHOT</jcl.version>
|
||||||
<jscl.version>1.0.5</jscl.version>
|
<jscl.version>1.0.7</jscl.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
Loading…
Reference in New Issue
Block a user