From 45a481930a25123fb454b36f5e062717f6a0fa8f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 21 Dec 2017 17:02:36 -0600 Subject: [PATCH] Updates --- .travis.yml | 14 +++----------- app/build.gradle | 8 ++++---- build.gradle | 4 ++-- lifeline/build.gradle | 8 ++++---- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cbe4dd..bacc8ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,8 @@ language: android jdk: - oraclejdk8 -android: - components: - - platform-tools - - tools - - build-tools-26.0.2 - - android-26 - -before_script: - # Install SDK license so Android Gradle plugin can install deps. +before_install: - mkdir "$ANDROID_HOME/licenses" || true - - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" + - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" -script: "./gradlew build" +script: "./gradlew build" \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 00b3989..1e132e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 26 + compileSdkVersion 27 defaultConfig { applicationId "com.commit451.lifeline.sample" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -23,9 +23,9 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:27.0.2' implementation project(':lifeline') } diff --git a/build.gradle b/build.gradle index 76e38de..55ee4d4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { - ext.kotlin_version = '1.1.51' + ext.kotlin_version = '1.2.10' repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/lifeline/build.gradle b/lifeline/build.gradle index e8a74a1..0ba9da1 100644 --- a/lifeline/build.gradle +++ b/lifeline/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 26 + compileSdkVersion 27 defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -22,8 +22,8 @@ android { } dependencies { - api "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:support-annotations:26.1.0' + api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'com.android.support:support-annotations:27.0.2' } apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'