Skip to content

Commit

Permalink
travis update
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasjunior committed Oct 17, 2016
1 parent 086dd7e commit 35c71dd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: android

jdk: oraclejdk8
android:
components:
- tools
- platform-tools
- build-tools-23.0.3
- android-23
- build-tools-24.0.3
- android-24
- extra-android-support
- extra-android-m2repository
- extra-google-m2repository
Expand Down
12 changes: 4 additions & 8 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
group = 'com.github.douglasjunior'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
minSdkVersion 7
targetSdkVersion 23
targetSdkVersion 24
versionCode 5
versionName "0.1.3"
}
Expand All @@ -19,10 +19,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

buildscript {
Expand All @@ -37,7 +33,7 @@ buildscript {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-annotations:23.2.1'
compile 'com.android.support:support-annotations:24.0.0'
}

// build a jar with source files
Expand Down
14 changes: 5 additions & 9 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "io.github.douglasjunior.androidSimpleTooltip.sample"
minSdkVersion 7
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "0.0.1"
}
Expand All @@ -17,15 +17,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:design:24.0.0'
compile project(':library')
}

0 comments on commit 35c71dd

Please sign in to comment.