Skip to content

Commit 875c989

Browse files
committed
Updates to build and travis
1 parent 5f40b06 commit 875c989

6 files changed

Lines changed: 10 additions & 26 deletions

File tree

.travis.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,9 @@ language: android
33
jdk:
44
- oraclejdk8
55

6-
android:
7-
components:
8-
- platform-tools
9-
- tools
10-
- build-tools-26.0.2
11-
- android-26
12-
136
before_install:
14-
# Install SDK license so Android Gradle plugin can install deps.
7+
- chmod +x gradlew
158
- mkdir "$ANDROID_HOME/licenses" || true
16-
- echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
9+
- echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
1710

18-
script: "./gradlew build"
11+
script: "./gradlew build"

adapterflowlayout/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ android {
2121
}
2222

2323
dependencies {
24-
api fileTree(dir: 'libs', include: ['*.jar'])
2524
compileOnly 'com.wefika:flowlayout:0.4.1'
2625
compileOnly project(':adapterlayout')
2726
}

adapterlayout-kotlin/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ android {
2525
}
2626

2727
dependencies {
28-
api fileTree(dir: 'libs', include: ['*.jar'])
29-
30-
api "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
28+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
3129

3230
compileOnly project(':adapterlayout')
3331
}

adapterlayout/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ android {
2121
}
2222

2323
dependencies {
24-
api fileTree(include: ['*.jar'], dir: 'libs')
2524
api "com.android.support:recyclerview-v7:$supportLibVersion"
2625
}
2726

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ ext {
2626
butterknifeVersion = '8.8.1'
2727
}
2828
dependencies {
29-
implementation fileTree(dir: 'libs', include: ['*.jar'])
3029

3130
implementation "com.android.support:appcompat-v7:$supportLibVersion"
3231
implementation "com.android.support:design:$supportLibVersion"

build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
21
apply plugin: 'com.github.ben-manes.versions'
32
buildscript {
4-
ext.kotlinVersion = '1.1.51'
3+
ext.kotlinVersion = '1.2.21'
54
repositories {
65
jcenter()
76
google()
87
}
98
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.0-beta7'
9+
classpath 'com.android.tools.build:gradle:3.0.1'
1110
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
12-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
13-
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
14-
15-
// NOTE: Do not place your application dependencies here; they belong
16-
// in the individual module build.gradle files
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
12+
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
1713
}
1814
}
1915

@@ -30,7 +26,7 @@ task clean(type: Delete) {
3026

3127
ext {
3228
minSdkVersion = 15
33-
compileSdkVersion = 26
29+
compileSdkVersion = 27
3430
targetSdkVersion = compileSdkVersion
35-
supportLibVersion = '26.1.0'
31+
supportLibVersion = '27.0.2'
3632
}

0 commit comments

Comments
 (0)