taler-android

commit 059f240efaa6330c7222ba30b01cb32362bad4a3
parent f67116bd983aa5ba8c0369fbe4f1fdb18274ab06
Author: Torsten Grote <t@grobox.de>
Date:   Fri, 29 May 2020 10:59:39 -0300

Upgrade dependencies and gradle

Diffstat:
A
.idea/jarRepositories.xml
 | 
31
+++++++++++++++++++++++++++++++
M
build.gradle
 | 
2
+-
M
cashier/build.gradle
 | 
2
+-
M
gradle/wrapper/gradle-wrapper.properties
 | 
4
++--
M
taler-kotlin-common/build.gradle
 | 
2
+-

5 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
+\ No newline at end of file
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }
diff --git a/cashier/build.gradle b/cashier/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
-    implementation "com.squareup.okhttp3:okhttp:3.12.6"
+    implementation "com.squareup.okhttp3:okhttp:3.12.12"
 
     testImplementation 'junit:junit:4.13'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 18 13:36:36 BRT 2020
+#Fri May 29 10:20:17 BRT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/taler-kotlin-common/build.gradle b/taler-kotlin-common/build.gradle
@@ -45,7 +45,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
 
     // Navigation
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"