Updating libs and tools versions

alexvasilkov · Jul 30, 2019 · 9865068 · 9865068
1 parent f0a4c26
commit 9865068
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -12,7 +12,7 @@ android {
 }
 
 dependencies {
-    compileOnly 'androidx.annotation:annotation:1.0.0'
+    compileOnly 'androidx.annotation:annotation:1.1.0'
     compileOnly 'androidx.viewpager:viewpager:1.0.0'
     compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
 }

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,12 +1,8 @@
-buildscript {
-    dependencies {
-        classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
-    }
+plugins {
+    id 'com.android.application'
+    id 'com.github.triplet.play' version '2.2.1'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'com.github.triplet.play'
-
 apply from: 'commons.gradle'
 apply from: 'release.gradle'
 
@@ -42,7 +38,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
 
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 
     implementation 'com.alexvasilkov:android-commons:2.0.2'
     implementation 'com.alexvasilkov:events:1.0.0'

diff --git a/sample/release.gradle b/sample/release.gradle
@@ -1,16 +1,6 @@
 final DIR = 'sample/signing'
 
 android {
-    playAccountConfigs {
-        config {
-            jsonFile = file('signing/play_account.json')
-        }
-    }
-
-    defaultConfig {
-        playAccountConfig = playAccountConfigs.config
-    }
-
     signingConfigs {
         debug {
             storeFile file('signing/debug.jks')
@@ -33,6 +23,11 @@ android {
     }
 }
 
+play {
+    serviceAccountCredentials = file('signing/play_account.json')
+    track = 'alpha'
+}
+
 project.afterEvaluate {
     // Setting up 'publishSample' task
     // Note, that in order to work this task requires ENCRYPT_KEY and UPLOAD_KEYSTORE_PWD env vars