Skip to content

Commit

Permalink
Updating build properties
Browse files Browse the repository at this point in the history
  • Loading branch information
blazsolar committed Aug 30, 2014
1 parent 6a39642 commit a1b5e26
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 18 deletions.
11 changes: 2 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
- ./gradlew coveralls
8 changes: 5 additions & 3 deletions FlowLayout/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions FlowLayoutExample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':FlowLayout', ':FlowLayoutExample'
include ':FlowLayout', ':FlowLayoutExample', ':test'
6 changes: 3 additions & 3 deletions test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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.+'
}

0 comments on commit a1b5e26

Please sign in to comment.