diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 38ef164f..eee0ba6d 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -62,125 +62,153 @@
-
-
-
- xmlns:android
- Namespace:
-
-
-
-
-
-
- xmlns:.*
- Namespace:
-
-
- BY_NAME
-
-
-
-
- .*:id
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
- .*:name
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
- name
- ^$
-
-
-
-
-
-
- style
- ^$
-
-
-
-
-
-
- .*
- ^$
-
-
- BY_NAME
-
-
-
-
- .*:layout_width
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
- .*:layout_height
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
- .*:layout_.*
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
- .*:width
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
- .*:height
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
- .*
- http://schemas.android.com/apk/res/android
-
-
- BY_NAME
-
-
-
-
- .*
- .*
-
-
- BY_NAME
-
+
+
+
+
+ xmlns:android
+ Namespace:
+
+
+
+
+
+
+
+
+ xmlns:.*
+ Namespace:
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+ ^$
+
+
+
+
+
+
+
+
+ style
+ ^$
+
+
+
+
+
+
+
+
+ .*
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:layout_width
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_height
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_.*
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:width
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:height
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ .*
+
+
+ BY_NAME
+
+
@@ -188,5 +216,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0d7d4561..afa3dedb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
+
-
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 92954b82..f1a41e1f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
-
-
-
@@ -43,104 +40,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- localhost
- 5050
-
-
@@ -157,5 +56,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run.xml b/.idea/runConfigurations/Run.xml
index d2a72f56..86690768 100644
--- a/.idea/runConfigurations/Run.xml
+++ b/.idea/runConfigurations/Run.xml
@@ -17,6 +17,10 @@
+
+
+
+
diff --git a/android-app-tests/android-app-tests.iml b/android-app-tests/android-app-tests.iml
index c339e42e..1e9d063f 100644
--- a/android-app-tests/android-app-tests.iml
+++ b/android-app-tests/android-app-tests.iml
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,8 @@
-
+
+
@@ -31,8 +32,8 @@
-
-
+
+
@@ -72,40 +73,44 @@
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
+
+
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/android-app-tests/build.gradle b/android-app-tests/build.gradle
index d08d0786..8ecf7445 100644
--- a/android-app-tests/build.gradle
+++ b/android-app-tests/build.gradle
@@ -23,19 +23,19 @@
apply plugin: 'java'
dependencies {
- def androidModule = project(':android-app')
- compile androidModule
+ def app = project(':android-app')
+ compile app
- testCompile androidModule.android.applicationVariants.toList().first().javaCompile.classpath
- testCompile androidModule.android.applicationVariants.toList().first().javaCompile.outputs.files
- testCompile files(androidModule.plugins.findPlugin("com.android.application").getBootClasspath())
+ testCompile app.android.applicationVariants.toList().first().javaCompile.classpath
+ testCompile app.android.applicationVariants.toList().first().javaCompile.outputs.files
+ testCompile files(app.android.bootClasspath)
testCompile 'junit:junit:4.11'
testCompile 'org.robolectric:robolectric:2.3'
testCompile 'org.mockito:mockito-all:1.9.5'
testCompile 'org.skyscreamer:jsonassert:1.2.3'
- testCompile 'com.android.support:support-v4:21.0.3'
- testCompile 'com.android.support:appcompat-v7:21.0.3'
+ testCompile 'com.android.support:support-v4:22.1.1'
+ testCompile 'com.android.support:appcompat-v7:22.1.1'
}
tasks.withType(Test) {
diff --git a/android-app/android-app.iml b/android-app/android-app.iml
index 7f37c031..1287315c 100644
--- a/android-app/android-app.iml
+++ b/android-app/android-app.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,9 +12,10 @@
-
-
+
+
+
@@ -25,7 +26,7 @@
-
+
@@ -34,12 +35,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -68,6 +69,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -80,42 +97,44 @@
-
-
-
+
-
-
+
+
-
+
+
+
-
+
+
+
+
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/android-app/build.gradle b/android-app/build.gradle
index acbb5c1d..4df999c9 100644
--- a/android-app/build.gradle
+++ b/android-app/build.gradle
@@ -56,8 +56,8 @@ dependencies {
compile 'org.solovyev:common-core:1.0.7'
compile 'org.solovyev:common-text:1.0.7'
compile 'org.solovyev:common-security:1.0.7'
- compile 'com.android.support:support-v4:21.0.3'
- compile 'com.android.support:appcompat-v7:21.0.3'
+ compile 'com.android.support:support-v4:22.1.1'
+ compile 'com.android.support:appcompat-v7:22.1.1'
compile('ch.acra:acra:4.5.0') {
exclude group: 'org.json'
}
@@ -72,14 +72,18 @@ dependencies {
}
compile 'org.solovyev.android:checkout:0.7.2@aar'
compile 'org.solovyev.android:material:0.1.2@aar'
- compile 'com.google.android.gms:play-services-ads:6.5.87@aar'
- compile 'com.google.android.gms:play-services-base:6.5.87@aar'
+ compile 'com.google.android.gms:play-services-ads:7.3.0@aar'
+ compile 'com.google.android.gms:play-services-base:7.3.0@aar'
+ compile 'com.google.android.gms:play-services-analytics:7.3.0@aar'
compile 'com.melnykov:floatingactionbutton:1.1.0'
+
+ debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
+ releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
}
task androidJavadocs(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.plugin.getBootClasspath().join(File.pathSeparator))
+ classpath += project.files(android.bootClasspath.join(File.pathSeparator))
configurations.compile.each { File file -> classpath += project.files(file.path) }
}
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 3c21fd30..8b6e3cd5 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
@@ -29,6 +29,9 @@ import android.graphics.Typeface;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.util.Log;
+
+import com.squareup.leakcanary.LeakCanary;
+
import org.acra.ACRA;
import org.acra.ReportingInteractionMode;
import org.acra.annotation.ReportsCrashes;
@@ -43,11 +46,12 @@ import org.solovyev.android.calculator.wizard.CalculatorWizards;
import org.solovyev.android.wizard.Wizards;
import org.solovyev.common.msg.MessageType;
-import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+
@ReportsCrashes(formKey = "",
formUri = "https://serso.cloudant.com/acra-cpp/_design/acra-storage/_update/report",
reportType = org.acra.sender.HttpSender.Type.JSON,
@@ -121,6 +125,8 @@ public class CalculatorApplication extends android.app.Application implements Sh
public void onCreate() {
if (!BuildConfig.DEBUG) {
ACRA.init(this);
+ } else {
+ LeakCanary.install(this);
}
if (!App.isInitialized()) {
diff --git a/build.gradle b/build.gradle
index 09f5f525..3d965603 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,11 @@ public String version_name() {
}
public int android_sdk_version() {
- return 21
+ return 22
}
public String android_build_tools_version() {
- return '21.1.2'
+ return '22.0.1'
}
public String android_min_sdk_version() {
@@ -24,7 +24,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:1.2.2'
}
}
diff --git a/calculatorpp.iml b/calculatorpp.iml
index 0bb6048a..1f90f96a 100644
--- a/calculatorpp.iml
+++ b/calculatorpp.iml
@@ -1,9 +1,10 @@
-
+
+
@@ -15,5 +16,4 @@
-
-
+
\ No newline at end of file
diff --git a/core/core.iml b/core/core.iml
index ac0bd202..9472019c 100644
--- a/core/core.iml
+++ b/core/core.iml
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,8 @@
-
+
+
@@ -41,6 +42,6 @@
+
-
-
+
\ No newline at end of file