From bd30fe6b3282dc3485b4deef2acf75a01493f734 Mon Sep 17 00:00:00 2001 From: rid-hrant Date: Tue, 12 Jun 2018 13:50:26 +0400 Subject: [PATCH 1/4] - Updated gradle version to 4.4 - Updated gradle plugin version to 3.1.3 - Updated compileSdkVersion, buildToolsVersion, targetSdkVersion to 27 - Updated support lib version to 27.1.1 - Changed deprecated dependency api to new --- build.gradle | 3 ++- dexter/build.gradle | 16 +++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- sample/build.gradle | 25 ++++++++++++------------ 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index ee2ae9d0..0bd37472 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.3' } } diff --git a/dexter/build.gradle b/dexter/build.gradle index 11191f30..87c5385c 100644 --- a/dexter/build.gradle +++ b/dexter/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' android { - compileSdkVersion 25 - buildToolsVersion '25.0.0' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 10 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" consumerProguardFiles 'proguard-rules.pro' @@ -25,9 +25,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:1.9.5' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:1.9.5' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7f031c51..d9972614 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 06 10:14:11 CET 2017 +#Tue Jun 12 13:21:11 AMT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index cb489c34..7c192138 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -7,12 +7,12 @@ configurations.all { } android { - compileSdkVersion 25 - buildToolsVersion '25.0.0' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.karumi.dexter.sample" minSdkVersion 18 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" @@ -30,14 +30,15 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.jakewharton:butterknife:8.6.0' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' + implementation 'com.jakewharton:butterknife:8.6.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0' - compile project(':dexter') - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' - androidTestCompile 'org.awaitility:awaitility:3.0.0' - androidTestCompile 'org.hamcrest:hamcrest-library:1.3' - androidTestCompile 'com.android.support.test:rules:1.0.0' + implementation project(':dexter') + androidTestImplementation 'com.android.support.test:runner:0.5' + androidTestImplementation 'com.android.support.test:rules:0.5' + androidTestImplementation 'org.awaitility:awaitility:3.0.0' + androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' + androidTestImplementation 'com.android.support.test:rules:1.0.0' } From 542f98f5837b1867e03848f8fad37066ad967352 Mon Sep 17 00:00:00 2001 From: rid-hrant Date: Wed, 13 Jun 2018 10:02:23 +0400 Subject: [PATCH 2/4] Changed min sdk version to 14 --- dexter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dexter/build.gradle b/dexter/build.gradle index 87c5385c..6d4d183b 100644 --- a/dexter/build.gradle +++ b/dexter/build.gradle @@ -6,7 +6,7 @@ android { buildToolsVersion '27.0.3' defaultConfig { - minSdkVersion 10 + minSdkVersion 14 targetSdkVersion 27 versionCode 1 versionName "1.0" From d77ecef2d0c3e792035614b16a2e36b785dea145 Mon Sep 17 00:00:00 2001 From: rid-hrant Date: Wed, 13 Jun 2018 10:02:54 +0400 Subject: [PATCH 3/4] Moved google repo to top of jcenter --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0bd37472..4e48fa31 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { - jcenter() google() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.1.3' From 200467e33511832a5501770c4d86a509d4b3de34 Mon Sep 17 00:00:00 2001 From: rid-hrant Date: Wed, 13 Jun 2018 10:37:21 +0400 Subject: [PATCH 4/4] Updated travis config file --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7bb1a926..098363f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,10 @@ env: android: components: - tools - - build-tools-25.0.0 + - build-tools-27.0.3 - platform-tools + - tools + - android-27 - android-24 - android-25 - extra-android-support @@ -18,6 +20,11 @@ android: - sys-img-armeabi-v7a-android-24 - sys-img-armeabi-v7a-android-25 + licenses: + - 'android-sdk-preview-license-52d11cd2' + - 'android-sdk-license-.+' + - 'google-gdk-license-.+' + before_script: - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a - QEMU_AUDIO_DRV=none emulator -avd test -no-window &