update Studio to 3.0 up

Change-Id: Id44c0118016998c29d823dd4335071b90aed4155
onlycyndi · Jan 18, 2018 · 361a6c9 · 361a6c9
1 parent 817c57b
commit 361a6c9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/ImagePicker/build.gradle b/ImagePicker/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.jfrog.bintray'
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION as int
-    buildToolsVersion BUILD_TOOLS_VERSION
+//    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION as int
@@ -24,11 +24,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile("com.github.bumptech.glide:glide:${LIB_GLIDE_VERSION}") {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    api("com.github.bumptech.glide:glide:${LIB_GLIDE_VERSION}") {
         exclude(group: 'com.google.android', module: 'support-v4')
     }
-    compile "com.android.support:support-v4:${LIB_ANDROID_SUPPORT_VERSION}"
+    api "com.android.support:support-v4:${LIB_ANDROID_SUPPORT_VERSION}"
 }
 
 allprojects {

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION as int
-    buildToolsVersion BUILD_TOOLS_VERSION
+//    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
         applicationId APPLICATION_ID
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:appcompat-v7:${LIB_ANDROID_SUPPORT_VERSION}"
-    compile project(':ImagePicker')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.android.support:appcompat-v7:${LIB_ANDROID_SUPPORT_VERSION}"
+    implementation project(':ImagePicker')
 }
diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,17 @@
 
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
+        google()
+
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
@@ -16,9 +23,13 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         jcenter()
+        google()
+
         maven {
-            url "https://maven.google.com"
+            url 'https://maven.google.com/'
+            name 'Google'
         }
     }
 }

diff --git 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.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip