Skip to content

Commit a1b5e26

Browse files
committed
Updating build properties
1 parent 6a39642 commit a1b5e26

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

Diff for: .travis.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jdk: oraclejdk7
33

44
env:
55
matrix:
6-
- ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
6+
- ANDROID_TARGET=android-20 ANDROID_ABI=armeabi-v7a
77
- ANDROID_TARGET=android-9 ANDROID_ABI=armeabi
88

99
android:
@@ -14,20 +14,13 @@ android:
1414
- extra-google-m2repository
1515

1616
before_install:
17-
# Coveralls
18-
- git clone git://github.com/blazsolar/coveralls-gradle-plugin.git coveralls-gradle-plugin
1917
# Emulator
2018
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
2119
- emulator -avd test -no-skin -no-audio -no-window &
2220

23-
install:
24-
- cd coveralls-gradle-plugin
25-
- gradle install
26-
- cd ..
27-
2821
before_script:
2922
- adb wait-for-device
3023
- adb shell input keyevent 82 &
3124

3225
after_success:
33-
- gradle coveralls
26+
- ./gradlew coveralls

Diff for: FlowLayout/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@ buildscript {
22
repositories {
33
mavenCentral()
44
mavenLocal()
5+
maven { url "http://dl.bintray.com/blazsolar/gradle-plugins" }
56
}
67

78
dependencies {
89
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.6.2-SNAPSHOT'
10+
classpath "com.github.blazsolar.gradle:coveralls-gradle-plugin:2.0.1"
911
}
1012
}
1113

1214
apply plugin: 'com.android.library'
13-
apply plugin: 'coveralls'
15+
apply plugin: 'com.github.blazsolar.coveralls'
1416

1517
repositories {
1618
mavenCentral()
@@ -21,12 +23,12 @@ dependencies {
2123
}
2224

2325
android {
24-
compileSdkVersion 19
26+
compileSdkVersion 20
2527
buildToolsVersion "20.0.0"
2628

2729
defaultConfig {
2830
minSdkVersion 9
29-
targetSdkVersion 19
31+
targetSdkVersion 20
3032
versionCode Integer.parseInt(project.VERSION_CODE)
3133
versionName project.VERSION_NAME
3234
}

Diff for: FlowLayoutExample/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ repositories {
55
}
66

77
android {
8-
compileSdkVersion 19
8+
compileSdkVersion 20
99
buildToolsVersion "20.0.0"
1010

1111
defaultConfig {
1212
minSdkVersion 9
13-
targetSdkVersion 19
13+
targetSdkVersion 20
1414
versionCode 1
1515
versionName "1.0"
1616
}

Diff for: settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':FlowLayout', ':FlowLayoutExample'
1+
include ':FlowLayout', ':FlowLayoutExample', ':test'

Diff for: test/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
apply plugin: 'com.android.application'
1818

1919
android {
20-
compileSdkVersion 'android-L'
20+
compileSdkVersion 20
2121
buildToolsVersion "20.0.0"
2222

2323
defaultConfig {
2424
applicationId "com.wefika.flowlayout.test"
2525
minSdkVersion 9
26-
targetSdkVersion 19
26+
targetSdkVersion 20
2727
versionCode 1
2828
versionName "1.0"
2929
}
@@ -42,5 +42,5 @@ android {
4242

4343
dependencies {
4444
compile fileTree(dir: 'libs', include: ['*.jar'])
45-
compile 'com.android.support:appcompat-v7:19.+'
45+
compile 'com.android.support:appcompat-v7:20.+'
4646
}

0 commit comments

Comments
 (0)