Merge pull request #217 from Glucosio/develop

Releasing Glucosio 0.10.3

Author: Paolo Rotolo

.travis.yml

@@ -23,7 +23,7 @@ after_success:
 
 script:
  - cd $TRAVIS_BUILD_DIR/
- - ./gradlew assembleDebug
+ - ./gradlew testDebugUnitTest assembleDebug
 
 notifications:
   slack: glucosio:uk2xb9sAxOaVedj7zePyuBqa

README.md

@@ -1,5 +1,6 @@
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/glucosio/localized.png)](https://crowdin.com/project/glucosio)
 [![Build Status](https://travis-ci.org/Glucosio/glucosio-android.svg)](https://travis-ci.org/Glucosio/glucosio-android)
+[![Codacy](https://img.shields.io/codacy/e27821fb6289410b8f58338c7e0bc686.svg)]()
 [![Stories in Ready](https://badge.waffle.io/Glucosio/android.svg?label=ready&title=Ready)](http://waffle.io/Glucosio/android)
 # Glucosio for Android
 Glucosio for Android, an user centered free and open source app for Diabetes management and research for Android.

app/build.gradle

@@ -1,67 +1,115 @@
+/*
+ * Copyright (C) 2016 Glucosio Foundation
+ *
+ * This file is part of Glucosio.
+ *
+ * Glucosio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * Glucosio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Glucosio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
 apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
     buildToolsVersion '23.0.2'
+
     lintOptions {
         abortOnError false
     }
+
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 14
-        versionName '0.10.2'
+        versionCode 18
+        versionName '0.10.3'
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
+
     buildTypes {
         debug {
             minifyEnabled false
             debuggable true
 
-            buildConfigField "String", "GOOGLE_ANALYTICS_TRACKER", '"UA-68882401-2"'
-
-            applicationIdSuffix '.daily'
             versionNameSuffix '-DEVEL'
+            applicationIdSuffix '.daily'
+
+            buildConfigField 'String', 'GOOGLE_ANALYTICS_TRACKER', '"UA-68882401-2"'
         }
+
         release {
             debuggable false
             minifyEnabled true
             shrinkResources true
             zipAlignEnabled true
-            buildConfigField "String", "GOOGLE_ANALYTICS_TRACKER", '"UA-68882401-2"'
+
+            buildConfigField 'String', 'GOOGLE_ANALYTICS_TRACKER', '"UA-68882401-2"'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     lintOptions {
         abortOnError false
     }
+
+    testOptions {
+        unitTests {
+            all {
+                // configure the test JVM arguments
+                jvmArgs '-noverify'
+            }
+        }
+    }
 }
 
 repositories {
     mavenCentral()
-    maven { url "https://jitpack.io" }
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    jcenter()
+    maven { url 'https://jitpack.io' }
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 }
 
 dependencies {
+    wearApp project(':wear')
+
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
     // Android Support libraries
-    compile 'com.android.support:appcompat-v7:23.2.0'
-    compile 'com.android.support:design:23.2.0'
-    compile 'com.android.support:cardview-v7:23.2.0'
-    compile 'com.android.support:recyclerview-v7:23.2.0'
-    compile 'com.android.support:percent:23.2.0'
+    compile "com.android.support:appcompat-v7:${androidSupportVer}"
+    compile "com.android.support:design:${androidSupportVer}"
+    compile "com.android.support:cardview-v7:${androidSupportVer}"
+    compile "com.android.support:recyclerview-v7:${androidSupportVer}"
+    compile "com.android.support:percent:${androidSupportVer}"
+
     compile 'com.google.android.support:wearable:1.3.0'
 
     // Google Play Services
-    compile 'com.google.android.gms:play-services-appinvite:8.4.0'
-    compile 'com.google.android.gms:play-services-analytics:8.4.0'
-    compile 'com.google.android.gms:play-services-drive:8.4.0'
-    compile 'com.google.android.gms:play-services-wearable:8.4.0'
+    compile "com.google.android.gms:play-services-appinvite:${googlePlayServicesVer}"
+    compile "com.google.android.gms:play-services-analytics:${googlePlayServicesVer}"
+    compile "com.google.android.gms:play-services-drive:${googlePlayServicesVer}"
+    compile "com.google.android.gms:play-services-wearable:${googlePlayServicesVer}"
+    compile "com.google.android.gms:play-services-gcm:${googlePlayServicesVer}"
+
+    //Smooch
+    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'io.smooch:core:latest.release'
+    compile 'io.smooch:ui:latest.release'
+
 
     // Other libraries
+    compile 'com.instabug.library:instabugcompat:2.3.1'
     compile 'io.realm:realm-android:0.87.5'
     compile 'com.github.clans:fab:1.6.2'
     compile 'com.wdullaer:materialdatetimepicker:2.2.0'
@@ -71,17 +119,33 @@ dependencies {
     compile('com.mikepenz:materialdrawer:5.0.5@aar') {
         transitive = true
     }
-    compile 'com.instabug.library:instabugcompat:2.1.1'
 
-    wearApp project(':wear')
+    testCompile "junit:junit:${junitVer}"
+    testCompile "org.mockito:mockito-all:${mockitoVer}"
+    testCompile "com.squareup.assertj:assertj-android:${androidAssertJVer}"
+    testCompile("org.robolectric:robolectric:${robolectricVer}") {
+        exclude group: 'commons-logging', module: 'commons-logging'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+    }
+    testCompile("org.robolectric:shadows-support-v4:${robolectricVer}") {
+        exclude group: 'commons-logging', module: 'commons-logging'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+    }
+    testCompile 'io.reactivex:rxjava:1.0.13'
+
     // Testing libraries
-/*    androidTestCompile 'com.android.support.test:rules:0.4.1'
+    androidTestCompile 'com.android.support.test:rules:0.4.1'
     androidTestCompile 'com.android.support.test:runner:0.4.1'
-    androidTestCompile 'com.android.support:support-annotations:23.2.0'
-    androidTestCompile 'com.android.support:recyclerview-v7:23.2.0'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.1'*/
+    androidTestCompile "com.android.support:support-annotations:${androidSupportVer}"
+    androidTestCompile "com.android.support:recyclerview-v7:${androidSupportVer}"
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2'
 }
 
-apply plugin: 'com.google.gms.google-services'
+configurations.all {
+    resolutionStrategy.force "com.android.support:support-annotations:${androidSupportVer}"
+    resolutionStrategy.force "com.android.support:design:${androidSupportVer}"
+    resolutionStrategy.force "com.android.support:appcompat-v7:${androidSupportVer}"
+}
+apply plugin: 'com.google.gms.google-services'

app/google-services.json

@@ -11,7 +11,8 @@
         "client_id": "android:org.glucosio.android",
         "client_type": 1,
         "android_client_info": {
-          "package_name": "org.glucosio.android"
+          "package_name": "org.glucosio.android",
+          "certificate_hash": []
         }
       },
       "oauth_client": [
@@ -54,7 +55,8 @@
         "client_id": "android:org.glucosio.android.daily",
         "client_type": 1,
         "android_client_info": {
-          "package_name": "org.glucosio.android.daily"
+          "package_name": "org.glucosio.android.daily",
+          "certificate_hash": []
         }
       },
       "oauth_client": [

app/proguard-rules.pro

@@ -1,38 +1,49 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/paolo/Android/Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-optimizationpasses 5
+-dump class_files.txt
+-printseeds seeds.txt
+-printusage unused.txt
+-printmapping mapping.txt
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging*/
+-allowaccessmodification
+-repackageclasses ''
 
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.MapActivity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+
+-keep public class org.apache.commons.io.**
+-keep public class com.google.gson.**
+-keep public class com.google.gson.** {public private protected *;}
+
+##---------------Begin: proguard configuration for Gson ----------
+-keepattributes *Annotation*,Signature
+-keep class org.glucosio.android.ActivityMonitor.ClassMultiPoints.** { *; }
+-keep public class org.glucosio.android.ActivityMonitor$ClassMultiPoints     { public protected *; }
+-keep public class org.glucosio.android.ActivityMonitor$ClassMultiPoints$ClassPoints { public protected *; }
+-keep public class org.glucosio.android.ActivityMonitor$ClassMultiPoints$ClassPoints$ClassPoint { public protected *; }
+-keepclassmembers enum * { *; }
+
+##---------------End: proguard configuration for Gson ----------
+
+
+
+# MPAndoridChart
+-keep class com.github.mikephil.charting.** { *; }
+
+# RxAndroid
+-dontwarn rx.internal.util.unsafe.**
+
+# Realm
 -keep class io.realm.annotations.RealmModule
 -keep @io.realm.annotations.RealmModule class *
 -keep class io.realm.internal.Keep
 -keep @io.realm.internal.Keep class * { *; }
 -dontwarn javax.**
 -dontwarn io.realm.**
 
-# RxAndroid
--dontwarn rx.internal.util.unsafe.**
-
-## Instabug
--dontwarn org.apache.http.**
--dontwarn android.net.http.AndroidHttpClient
--dontwarn com.google.android.gms.**
--dontwarn com.android.volley.toolbox.**
--dontwarn com.instabug.**
-
 ## AppCompat
 -keep public class android.support.v7.widget.** { *; }
 -keep public class android.support.v7.internal.widget.** { *; }
@@ -59,4 +70,46 @@
 
 -keepnames class * implements android.os.Parcelable {
     public static final ** CREATOR;
+}
+
+## Instabug
+-dontwarn org.apache.http.**
+-dontwarn android.net.http.AndroidHttpClient
+-dontwarn com.google.android.gms.**
+-dontwarn com.android.volley.toolbox.**
+-dontwarn com.instabug.**
+
+## Smooch
+-dontwarn okio.**
+-keep class okio.**
+-keep class com.google.gson.**
+
+
+-keep class * extends java.util.ListResourceBundle {
+    protected java.lang.Object[][] getContents();
+}
+
+# Keep SafeParcelable value, needed for reflection. This is required to support backwards
+# compatibility of some classes.
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+# Keep the names of classes/members we need for client functionality.
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
+
+#  Needed by google-api-client to keep generic types and @Key annotations accessed via reflection
+
+-keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault
+
+-keepclassmembers class * {
+   @com.google.api.client.util.Key <fields>;
 }

app/src/androidTest/java/org/glucosio/android/HelloActivityTest.java

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2016 Glucosio Foundation
+ *
+ * This file is part of Glucosio.
+ *
+ * Glucosio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * Glucosio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Glucosio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
 package org.glucosio.android;
 
 import android.support.test.rule.ActivityTestRule;

app/src/androidTest/java/org/glucosio/android/MainActivityTest.java

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2016 Glucosio Foundation
+ *
+ * This file is part of Glucosio.
+ *
+ * Glucosio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * Glucosio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Glucosio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
 package org.glucosio.android;
 
 import android.support.test.rule.ActivityTestRule;
@@ -25,7 +45,7 @@ public class MainActivityTest {
     @Rule
     public ActivityTestRule<MainActivity> mRule = new ActivityTestRule<>(MainActivity.class);
 
-    HelloActivityTest previousTest = new HelloActivityTest();
+    private HelloActivityTest previousTest = new HelloActivityTest();
 
     private void goThroughHelloActivity() throws InterruptedException {
         previousTest.check_004_IfICanEnterMyAgeUsingHelloAgeEditText();