Skip to content

Changes to run sample on Android Studio 3.0 and dependencies updates #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
15 changes: 9 additions & 6 deletions android-easylocation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ ext {
}
//noinspection GroovyMissingReturnStatement
android {
compileSdkVersion 24
buildToolsVersion "24.0.3"
compileSdkVersion rootProject.ext.compile_sdk_version
buildToolsVersion rootProject.ext.build_tools_version

defaultConfig {
minSdkVersion 15
targetSdkVersion 24
minSdkVersion rootProject.ext.min_sdk_version
targetSdkVersion rootProject.ext.target_sdk_version
versionCode 1
versionName "1.0.2"

Expand All @@ -46,12 +46,15 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
provided "com.google.android.gms:play-services-location:9.2.0"
provided ("com.google.android.gms:play-services-location:$play_services_version") {
exclude group: "com.android.support", module: "support-v4"
exclude group: "com.android.support", module: "support-media-compat"
}

androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.2.1'
implementation "com.android.support:appcompat-v7:$support_version"
testCompile 'junit:junit:4.12'
}
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
Expand Down
21 changes: 12 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'android-apt'

//noinspection GroovyMissingReturnStatement,GroovyMissingReturnStatement
android {
compileSdkVersion 24
buildToolsVersion "24.0.3"
compileSdkVersion rootProject.ext.compile_sdk_version
buildToolsVersion rootProject.ext.build_tools_version

defaultConfig {
applicationId "com.akhgupta.easylocation.demo"
minSdkVersion 15
targetSdkVersion 24
minSdkVersion rootProject.ext.min_sdk_version
targetSdkVersion rootProject.ext.target_sdk_version
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -23,16 +23,19 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
compile "com.google.android.gms:play-services-location:9.6.0"
compile "com.jakewharton:butterknife:$butterknife_version"
annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife_version"
implementation ("com.google.android.gms:play-services-location:$play_services_version") {
exclude group: "com.android.support", module: "support-v4"
exclude group: "com.android.support", module: "support-media-compat"
}



androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.2.1'
implementation "com.android.support:appcompat-v7:$support_version"
testCompile 'junit:junit:4.12'
compile project(':android-easylocation')
}
13 changes: 12 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.compile_sdk_version = 27
ext.build_tools_version = '27.0.0'
ext.min_sdk_version = 15
ext.target_sdk_version = 27

ext.support_version = '27.0.0'
ext.play_services_version = '11.4.2'
ext.butterknife_version = '8.8.0'

repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
Expand All @@ -19,6 +29,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip