From a1b5e26a5b324d1032239a68916900f6db712256 Mon Sep 17 00:00:00 2001 From: Blaz Solar Date: Sat, 30 Aug 2014 10:50:27 +0200 Subject: [PATCH] Updating build properties --- .travis.yml | 11 ++--------- FlowLayout/build.gradle | 8 +++++--- FlowLayoutExample/build.gradle | 4 ++-- settings.gradle | 2 +- test/build.gradle | 6 +++--- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index e927c45..078dde3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: oraclejdk7 env: matrix: - - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a + - ANDROID_TARGET=android-20 ANDROID_ABI=armeabi-v7a - ANDROID_TARGET=android-9 ANDROID_ABI=armeabi android: @@ -14,20 +14,13 @@ android: - extra-google-m2repository before_install: - # Coveralls - - git clone git://github.com/blazsolar/coveralls-gradle-plugin.git coveralls-gradle-plugin # Emulator - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - emulator -avd test -no-skin -no-audio -no-window & -install: - - cd coveralls-gradle-plugin - - gradle install - - cd .. - before_script: - adb wait-for-device - adb shell input keyevent 82 & after_success: - - gradle coveralls \ No newline at end of file + - ./gradlew coveralls \ No newline at end of file diff --git a/FlowLayout/build.gradle b/FlowLayout/build.gradle index 264aa11..22eaaf8 100644 --- a/FlowLayout/build.gradle +++ b/FlowLayout/build.gradle @@ -2,15 +2,17 @@ buildscript { repositories { mavenCentral() mavenLocal() + maven { url "http://dl.bintray.com/blazsolar/gradle-plugins" } } dependencies { classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.6.2-SNAPSHOT' + classpath "com.github.blazsolar.gradle:coveralls-gradle-plugin:2.0.1" } } apply plugin: 'com.android.library' -apply plugin: 'coveralls' +apply plugin: 'com.github.blazsolar.coveralls' repositories { mavenCentral() @@ -21,12 +23,12 @@ dependencies { } android { - compileSdkVersion 19 + compileSdkVersion 20 buildToolsVersion "20.0.0" defaultConfig { minSdkVersion 9 - targetSdkVersion 19 + targetSdkVersion 20 versionCode Integer.parseInt(project.VERSION_CODE) versionName project.VERSION_NAME } diff --git a/FlowLayoutExample/build.gradle b/FlowLayoutExample/build.gradle index 4dfa013..6c8e480 100644 --- a/FlowLayoutExample/build.gradle +++ b/FlowLayoutExample/build.gradle @@ -5,12 +5,12 @@ repositories { } android { - compileSdkVersion 19 + compileSdkVersion 20 buildToolsVersion "20.0.0" defaultConfig { minSdkVersion 9 - targetSdkVersion 19 + targetSdkVersion 20 versionCode 1 versionName "1.0" } diff --git a/settings.gradle b/settings.gradle index ea0bdd4..efa2276 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':FlowLayout', ':FlowLayoutExample' +include ':FlowLayout', ':FlowLayoutExample', ':test' diff --git a/test/build.gradle b/test/build.gradle index 8dd6828..48367e7 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -17,13 +17,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 'android-L' + compileSdkVersion 20 buildToolsVersion "20.0.0" defaultConfig { applicationId "com.wefika.flowlayout.test" minSdkVersion 9 - targetSdkVersion 19 + targetSdkVersion 20 versionCode 1 versionName "1.0" } @@ -42,5 +42,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:19.+' + compile 'com.android.support:appcompat-v7:20.+' }