Merge pull request #42 from samirma/master

Updating library versions.
googlecodelabs · May 24, 2018 · f1725ee · f1725ee
2 parents 33044fe + aa565f7
commit f1725ee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '26.0.3'
 
     defaultConfig {
         applicationId "com.google.android.perftesting"
-        minSdkVersion 11
-        targetSdkVersion 22
+        minSdkVersion 14
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -24,26 +24,30 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
-    String supportLibVersion = "23.4.0"
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    String supportLibVersion = "27.0.2"
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
     compile "com.android.support:support-v4:${supportLibVersion}"
-    compile 'com.github.bumptech.glide:glide:3.6.1'
-
+    compile 'com.github.bumptech.glide:glide:3.8.0'
     // TODO(developer): Comment in the following dependencies to enable Espresso and related libraries in this project.
     // Force the use of a specific version of the annotations library because the app compile
     // dependencies require this version transitively, but an androidTestCompile dependency
     // requires a different version. See http://goo.gl/iH4WDq for more info.
-//     androidTestCompile "com.android.support:support-annotations:${supportLibVersion}"
-//     androidTestCompile 'com.android.support.test:runner:0.5'
-//     androidTestCompile 'com.android.support.test:rules:0.5'
-//     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+    //     androidTestCompile "com.android.support:support-annotations:${supportLibVersion}"
+    //     androidTestCompile 'com.android.support.test:runner:0.5'
+    //     androidTestCompile 'com.android.support.test:rules:0.5'
+    //     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
 }
 
 // Create performance testing tasks for all connected Android devices using a Gradle plugin defined
 // in the buildSrc directory.
-// apply plugin: PerfTestTaskGeneratorPlugin
+// apply plugin: PerfTestTaskGeneratorPlugin
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,11 @@
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,5 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        mavenCentral()
+        google()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 10 12:48:35 PDT 2016
+#Fri Jan 19 15:00:17 WET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip