Skip to content
This repository has been archived by the owner on Jul 2, 2021. It is now read-only.

Commit

Permalink
Updated libraries (#208)
Browse files Browse the repository at this point in the history
* Update several libraries versions:
  * Gradle version to 4.4
  * Gradle plugin version to 3.1.3
  * compileSdkVersion, buildToolsVersion & targetSdkVersion to 27
  * Support lib version to 27.1.1
* Change `compile` keyword to `implementation` in gradle dependencies
* Changed min sdk version to 14
* Moved google repo to top of jcenter
* Updated travis config file
  • Loading branch information
Hrant Alaverdyan authored and Serchinastico committed Jun 21, 2018
1 parent 65a4a59 commit e66d9f9
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 25 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 &
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.1.3'
}
}

Expand Down
18 changes: 9 additions & 9 deletions dexter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
minSdkVersion 14
targetSdkVersion 27
versionCode 1
versionName "1.0"
consumerProguardFiles 'proguard-rules.pro'
Expand All @@ -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'
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
25 changes: 13 additions & 12 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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'
}

0 comments on commit e66d9f9

Please sign in to comment.