From 8279b868ad75791bdbfb10bcc244f0060e930e01 Mon Sep 17 00:00:00 2001 From: Jamie McDonald Date: Tue, 8 Sep 2015 22:18:19 +0200 Subject: [PATCH] Version bumps & do less with Travis --- .travis.yml | 16 +++------------- build.gradle | 2 +- example/build.gradle | 6 +++--- lib/build.gradle | 12 ++++++------ 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index efe0251..ca008f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,20 +2,10 @@ language: android android: components: - - build-tools-21.1.2 - - android-21 + - build-tools-23.0.1 + - android-22 - extra-android-support - - sys-img-armeabi-v7a-android-21 install: - - ./gradlew :lib:build - -before_script: - - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a - - emulator -avd test -no-skin -no-audio -no-window & - - android-wait-for-emulator - - adb shell input keyevent 82 & - -script: - - ./gradlew :lib:connectedAndroidTest + - ./gradlew build \ No newline at end of file diff --git a/build.gradle b/build.gradle index d7948b9..a34833b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.2' + classpath 'com.android.tools.build:gradle:1.2.3' } } diff --git a/example/build.gradle b/example/build.gradle index d7b4936..58d4c58 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' archivesBaseName = 'android-crop-example' android { - compileSdkVersion 21 - buildToolsVersion '21.1.2' + compileSdkVersion 22 + buildToolsVersion '23.0.1' defaultConfig { minSdkVersion 10 - targetSdkVersion 21 + targetSdkVersion 22 versionCode Integer.parseInt(project.VERSION_CODE) versionName project.VERSION } diff --git a/lib/build.gradle b/lib/build.gradle index 7514b4d..41dbfdf 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -6,12 +6,12 @@ apply plugin: 'signing' archivesBaseName = 'android-crop' android { - compileSdkVersion 21 - buildToolsVersion '21.1.2' + compileSdkVersion 22 + buildToolsVersion '23.0.1' defaultConfig { minSdkVersion 10 - targetSdkVersion 21 + targetSdkVersion 22 testApplicationId 'com.soundcloud.android.crop.test' testInstrumentationRunner 'android.test.InstrumentationTestRunner' @@ -19,10 +19,10 @@ android { } dependencies { - compile 'com.android.support:support-annotations:21.0.0' - compile 'com.android.support:support-v4:21.0.3' + compile 'com.android.support:support-annotations:23.0.1' + compile 'com.android.support:support-v4:23.0.1' androidTestCompile 'com.squareup:fest-android:1.0.7' - androidTestCompile 'com.android.support:support-v4:21.0.3' + androidTestCompile 'com.android.support:support-v4:23.0.1' androidTestCompile 'org.mockito:mockito-core:1.9.5' androidTestCompile 'com.google.dexmaker:dexmaker:1.0' androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'