Merge pull request #1448 from nightscout/dev

3.1.0

.circleci/config.yml

@@ -20,7 +20,10 @@ jobs:
 
       # The next step will run the unit tests
       - android/run-tests:
-          test-command: ./gradlew -Pcoverage -PfirebaseDisable testFullDebugUnitTest jacocoTestFullDebugUnitTestReport
+          test-command: ./gradlew testFullDebugUnitTest
+
+      - android/run-tests:
+          test-command: ./gradlew jacocoAllDebugReport
 
       # Then start the emulator and run the Instrumentation tests!
       #      - android/start-emulator-and-run-tests:
@@ -33,35 +36,7 @@ jobs:
       #          command: |
       #            ./gradlew assembleRelease
       - codecov/upload:
-          file: './app/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './automation/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './combo/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './core/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './dana/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './danar/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './danars/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './database/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './insight/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './medtronic/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './omnipod-common/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './omnipod-dash/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './omnipod-eros/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './rileylink/build/jacoco/jacoco.xml'
-      - codecov/upload:
-          file: './wear/build/jacoco/jacoco.xml'
+          file: './build/reports/jacoco/jacocoAllDebugReport/jacocoAllDebugReport.xml'
 
 workflows:
   # Below is the definition of your workflow.

CONTRIBUTING.md

@@ -44,5 +44,5 @@ Hints
 * Start small, it is easier to review smaller changes that affect fewer parts of code 
 * Take a look into Issues list (https://github.com/nightscout/AndroidAPS/issues) - maybe there is something you can fix or implement
 * For new features, make sure there is Issue to track progress and have on-topic discussion
-* Reach out to community, discuss idea on Gitter (https://gitter.im/MilosKozak/AndroidAPS)
+* Reach out to community, discuss idea on Discord (https://discord.gg/4fQUWHZ4Mw)
 * Speak with other developers to minimise merge conflicts. Find out who worked, working or plan to work on speciffic issue or part of app

README.md

@@ -1,15 +1,19 @@
 # AndroidAPS
-
 * Check the wiki: https://androidaps.readthedocs.io
 *  Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping  https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
 
 [![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw)
 
-[![Build status](https://travis-ci.org/nightscout/AndroidAPS.svg?branch=master)](https://travis-ci.org/nightscout/AndroidAPS)
+[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.androidaps.org/project/androidaps)
 [![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://androidaps.readthedocs.io/en/latest/?badge=latest)
-[![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
-dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+
+DEV: 
+[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev)
+[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+
 
+<img src="https://cdn.iconscout.com/icon/free/png-256/bitcoin-384-920569.png" srcset="https://cdn.iconscout.com/icon/free/png-512/bitcoin-384-920569.png 2x" alt="Bitcoin Icon" width="100">
 
-![BTC](https://bitit.io/assets/coins/icon-btc-1e5a37bc0eb730ac83130d7aa859052bd4b53ac3f86f99966627801f7b0410be.svg) 3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2
+3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2

app/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.google.firebase.crashlytics'
 
-apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
-apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
+apply from: "${project.rootDir}/core/android_dependencies.gradle"
+apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 repositories {
     mavenCentral()
@@ -97,19 +97,15 @@ def allCommitted = { ->
     return stringBuilder.toString().isEmpty()
 }
 
-tasks.matching { it instanceof Test }.all {
-    testLogging.events = ["failed", "skipped", "started"]
-    // testLogging.events = ["failed", "skipped", "started", "standard_out"] use to display stdout in travis
-    testLogging.exceptionFormat = "full"
-}
-
 android {
+
+    namespace 'info.nightscout.androidaps'
     ndkVersion "21.1.6352462"
 
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "3.0.0.2"
+        version "3.1.0"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -167,9 +163,6 @@ android {
 
 allprojects {
     repositories {
-        flatDir {
-            dirs 'libs'
-        }
     }
 }
 
@@ -207,7 +200,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 }
 
-apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/test_dependencies.gradle"
 
 
 /*