From e27b8ea1e03e7d92561fd84c68b19ec4b977d4a7 Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Sun, 21 Oct 2018 15:15:30 +0300 Subject: [PATCH 1/3] Update of gradle files --- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 8 ++++---- sample/build.gradle | 10 +++++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 7d15631..8e9eb58 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,16 @@ buildscript { repositories { mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:3.2.1' } } allprojects { repositories { mavenCentral() + google() } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f40b555..d06e471 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip diff --git a/library/build.gradle b/library/build.gradle index 1918b4d..326e397 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '23.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { - minSdkVersion 9 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 28 } } diff --git a/sample/build.gradle b/sample/build.gradle index 740fb6f..43f5d63 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion '23.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { - minSdkVersion 9 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -23,5 +23,5 @@ repositories { } dependencies { - compile project(':library') + implementation project(':library') } \ No newline at end of file From a3cc66344c60b2255d7402836f6dc9546a216412 Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Sun, 21 Oct 2018 15:16:40 +0300 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 180d4cb..63194c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,16 +5,16 @@ android: components: - tools - platform-tools - - build-tools-23.0.2 - - android-23 + - build-tools-28.0.3 + - android-28 - extra-google-google_play_services - extra-android-m2repository - extra-android-support - extra-google-m2repository - - sys-img-armeabi-v7a-android-21 + - sys-img-armeabi-v7a-android-28 before_script: - - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a + - echo no | android create avd --force -n test -t android-28 --abi armeabi-v7a - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & From 6df2f5e990649b3c792acac5bd303a61323f692d Mon Sep 17 00:00:00 2001 From: Ivan Terekhin Date: Tue, 5 Feb 2019 17:29:45 +0300 Subject: [PATCH 3/3] Travis updated --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63194c1..6367bdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ android: - extra-android-m2repository - extra-android-support - extra-google-m2repository - - sys-img-armeabi-v7a-android-28 + - sys-img-armeabi-v7a-android-21 before_script: - - echo no | android create avd --force -n test -t android-28 --abi armeabi-v7a + - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 &