From 059f240efaa6330c7222ba30b01cb32362bad4a3 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 29 May 2020 10:59:39 -0300 Subject: Upgrade dependencies and gradle --- .idea/jarRepositories.xml | 30 ++++++++++++++++++++++++++++++ build.gradle | 2 +- cashier/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- taler-kotlin-common/build.gradle | 2 +- 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..eb2873e --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index ec72fa3..505fbeb 100644 --- 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 index 7b311c3..0d06c60 100644 --- 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 index daff887..43ec45b 100644 --- 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 index 1c53839..573a329 100644 --- 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" -- cgit v1.2.3