From eaa0c6275cec7c89b37774d06b523ae30c85dc0e Mon Sep 17 00:00:00 2001 From: Daniel Passos Date: Thu, 26 Oct 2017 18:20:05 -0200 Subject: [PATCH 1/5] Update to Android O --- build.gradle | 8 ++++---- circle.yml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 3 +-- library/build.gradle | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 50b2e40..bc43a7e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,17 @@ 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' } } - allprojects { repositories { + google() jcenter() - mavenLocal() } } diff --git a/circle.yml b/circle.yml index 8aad797..6473c56 100644 --- a/circle.yml +++ b/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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dd166ba..bf1b63c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/library/build.gradle b/library/build.gradle index 3bd1503..6e5cc34 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' 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") From 67680a19a9f0cea8f22b3272e3923d77be1cdee7 Mon Sep 17 00:00:00 2001 From: Daniel Passos Date: Thu, 26 Oct 2017 18:20:25 -0200 Subject: [PATCH 2/5] Update AeroGear dependencies --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 6e5cc34..5c63650 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -36,8 +36,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" } From c7689863c3f3d40485386f978fc7297060f8f927 Mon Sep 17 00:00:00 2001 From: Daniel Passos Date: Thu, 26 Oct 2017 18:22:20 -0200 Subject: [PATCH 3/5] Add codecov --- build.gradle | 1 + circle.yml | 4 ++++ codecov.yml | 6 ++++++ library/build.gradle | 5 ++++- 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 codecov.yml diff --git a/build.gradle b/build.gradle index bc43a7e..4c59975 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { dependencies { 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 { diff --git a/circle.yml b/circle.yml index 6473c56..d999cbd 100644 --- a/circle.yml +++ b/circle.yml @@ -32,3 +32,7 @@ test: override: - ./gradlew build connectedCheck + + post: + - bash <(curl -s https://codecov.io/bash) + \ No newline at end of file diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..62aa275 --- /dev/null +++ b/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 diff --git a/library/build.gradle b/library/build.gradle index 5c63650..4b25c7a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'jacoco-android' android { compileSdkVersion 26 @@ -16,9 +17,11 @@ android { } buildTypes { debug { + testCoverageEnabled true + } + release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } } packagingOptions { From 07ba1f582b2102a400eb3e676090996ba1f8cc34 Mon Sep 17 00:00:00 2001 From: Daniel Passos Date: Fri, 27 Oct 2017 14:19:55 -0200 Subject: [PATCH 4/5] Add multidex --- library/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/library/build.gradle b/library/build.gradle index 4b25c7a..ba3f770 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,6 +14,7 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + multiDexEnabled true } buildTypes { debug { From 167a54ebd3ae586cb8ee13b632f741fce587b83e Mon Sep 17 00:00:00 2001 From: Daniel Passos Date: Thu, 26 Oct 2017 18:23:04 -0200 Subject: [PATCH 5/5] prepare release 4.0.0 --- circle.yml | 1 - gradle.properties | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index d999cbd..3dbd699 100644 --- a/circle.yml +++ b/circle.yml @@ -35,4 +35,3 @@ test: post: - bash <(curl -s https://codecov.io/bash) - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3ff2288..12495f9 100644 --- a/gradle.properties +++ b/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