Skip to content

Commit

Permalink
Update lastest gradle, sdk version and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
akexorcist committed Nov 9, 2017
1 parent 2ed41e6 commit 159eb25
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ jdk: oraclejdk8
android:
components:
- tools
- build-tools-25.0.1
- android-25
- build-tools-26.0.2
- android-26
- extra-android-m2repository
- extra-android-support
- extra-google-m2repository
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':googleDirectionLibrary')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.0.1'
compile 'com.android.support:design:25.0.1'
compile 'com.google.android.gms:play-services-maps:10.0.1'
compile 'com.android.support:appcompat-v7:27.0.0'
compile 'com.android.support:design:27.0.0'
compile 'com.google.android.gms:play-services-maps:11.6.0'
}
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:3.0.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -21,6 +25,10 @@ allprojects {
group = GROUP
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions googleDirectionLibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
compile('com.squareup.retrofit2:converter-gson:2.1.0') {
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
compile('com.squareup.retrofit2:converter-gson:+') {
exclude module: 'retrofit'
}
compile('com.google.android.gms:play-services-maps:10.0.1') {
compile('com.google.android.gms:play-services-maps:+') {
exclude module: 'support-annotations'
exclude module: 'support-v4'
exclude module: 'play-services-base'
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=Akexorcist
POM_DEVELOPER_NAME=Somkiat Khitwongwattana

ANDROID_BUILD_TOOLS_VERSION=25.0.1
ANDROID_COMPILE_SDK_VERSION=25
ANDROID_TARGET_SDK_VERSION=25
ANDROID_BUILD_TOOLS_VERSION=27.0.1
ANDROID_COMPILE_SDK_VERSION=27
ANDROID_TARGET_SDK_VERSION=27
ANDROID_MIN_SDK=14
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 @@
#Wed Nov 30 23:11:15 ICT 2016
#Fri Nov 10 01:42:08 ICT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 comments on commit 159eb25

Please sign in to comment.