Merge branch 'Android-O' of github.com:aerogear/aerogear-android-authz

build.gradle

@@ -1,17 +1,18 @@
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
     }
 }
-
 allprojects {
     repositories {
+        google()
         jcenter()
-        mavenLocal()
     }
 }
 

circle.yml

@@ -3,8 +3,8 @@ machine:
     version: oraclejdk8
   environment:
     QEMU_AUDIO_DRV: none
-    ANDROID_SDK: "android-25"
-    BUILD_TOOLS: "25.0.3"
+    ANDROID_SDK: "android-26"
+    BUILD_TOOLS: "26.0.2"
     ANDROID_EMULATOR: "circleci-android24"
     ANDROID_ABI: "armeabi-v7a"
 
@@ -32,3 +32,6 @@ test:
 
   override:
     - ./gradlew build connectedCheck
+
+  post:
+    - bash <(curl -s https://codecov.io/bash)

codecov.yml

@@ -0,0 +1,6 @@
+coverage:
+  status:
+    project: 
+      default:
+        target: auto  # this is default
+        if_not_found: success  # no commit found? still set a success

gradle.properties

@@ -1,7 +1,7 @@
 # Android Stuff
 
-VERSION_CODE=311
-VERSION_NAME=3.1.1
+VERSION_CODE=400
+VERSION_NAME=4.0.0
 
 # Bintray Stuff
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Jul 20 10:35:25 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

library/build.gradle

@@ -1,24 +1,28 @@
 apply plugin: 'com.android.library'
+apply plugin: 'jacoco-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
 
         versionCode Integer.parseInt(project.property("VERSION_CODE"))
         versionName project.property("VERSION_NAME")
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
+        multiDexEnabled true
     }
     buildTypes {
         debug {
+            testCoverageEnabled true
+        }
+        release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
         }
     }
     packagingOptions {
@@ -36,8 +40,8 @@ android {
 }
 
 dependencies {
-    compile 'org.jboss.aerogear:aerogear-android-store:3.1.0'
-    compile ('org.jboss.aerogear:aerogear-android-pipe:3.2.0') {
+    compile 'org.jboss.aerogear:aerogear-android-store:4.0.0'
+    compile ('org.jboss.aerogear:aerogear-android-pipe:4.0.0') {
         exclude group: 'com.android.support', module: "support-v4"
     }