update dependencies

0-Rainer-Stoff-0 · Dec 21, 2020 · 81aa7ab · 81aa7ab
1 parent f6e2e3f
commit 81aa7ab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,14 +7,12 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("org.eclipse.jgit:org.eclipse.jgit:5.9.0.202009080501-r")
-        // TODO: remove once upgraded version supports variantFilter out of the box
-        classpath("com.android.tools.build:gradle:4.0.2")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r")
     }
 }
 
 plugins {
-    id("com.github.triplet.play") version "2.8.1"
+    id("com.github.triplet.play") version "3.0.0"
     id("com.jaredsburrows.license") version "0.8.80"
     id("com.android.application")
 }
@@ -108,24 +106,24 @@ afterEvaluate {
 }
 
 play {
-    serviceAccountCredentials = file("../../google-key.json")
+    serviceAccountCredentials.set(file("../../google-key.json"))
 }
 
 dependencies {
     implementation("androidx.appcompat:appcompat:1.3.0-alpha02")
     implementation("androidx.cardview:cardview:1.0.0")
     implementation("androidx.preference:preference:1.1.1")
-    implementation("androidx.security:security-crypto:1.1.0-alpha02")
+    implementation("androidx.security:security-crypto:1.1.0-alpha03")
     implementation("androidx.viewpager2:viewpager2:1.1.0-alpha01")
-    implementation("com.google.android.material:material:1.3.0-alpha03")
+    implementation("com.google.android.material:material:1.3.0-beta01")
     implementation("com.hypertrack:hyperlog:0.0.10") {
         exclude(group = "com.android.volley")
     }
     implementation("org.altbeacon:android-beacon-library:2.17.1")
     implementation("org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5")
     testImplementation("junit:junit:4.13.1")
-    testImplementation("org.assertj:assertj-core:3.18.0")
-    testImplementation("org.mockito:mockito-inline:3.6.0")
+    testImplementation("org.assertj:assertj-core:3.18.1")
+    testImplementation("org.mockito:mockito-inline:3.6.28")
     testRuntimeOnly("com.android.volley:volley:1.1.1")
 }
 

diff --git a/app/src/main/assets/open_source_licenses.html b/app/src/main/assets/open_source_licenses.html
@@ -191,7 +191,7 @@ <h3>Notice for packages:</h3>
           <dt>Copyright &copy; 2015 The Android Open Source Project</dt>
         </dl>
       </li>
-      <li><a href="#1934118923">AndroidX Security (1.1.0-alpha02)</a>
+      <li><a href="#1934118923">AndroidX Security (1.1.0-alpha03)</a>
         <dl>
           <dt>Copyright &copy; 2019 The Android Open Source Project</dt>
         </dl>
@@ -211,12 +211,12 @@ <h3>Notice for packages:</h3>
           <dt>Copyright &copy; 20xx The original author or authors</dt>
         </dl>
       </li>
-      <li><a href="#1934118923">Material Components for Android (1.3.0-alpha03)</a>
+      <li><a href="#1934118923">Material Components for Android (1.3.0-beta01)</a>
         <dl>
           <dt>Copyright &copy; 2015 The Android Open Source Project</dt>
         </dl>
       </li>
-      <li><a href="#1934118923">Tink Cryptography API for Android (1.4.0)</a>
+      <li><a href="#1934118923">Tink Cryptography API for Android (1.5.0)</a>
         <dl>
           <dt>Copyright &copy; 20xx </dt>
         </dl>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,12 +4,12 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.2")
+        classpath("com.android.tools.build:gradle:4.1.1")
     }
 }
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.35.0"
+    id("com.github.ben-manes.versions") version "0.36.0"
 }
 
 allprojects {

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-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip