From 6c9ea7b8773a3ad81e36d3ca014cc5579ae89a42 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 4 Feb 2021 11:48:41 -0300 Subject: Upgrade non-Taler libraries --- .idea/compiler.xml | 6 +++++- .idea/gradle.xml | 1 + anastasis-ui/build.gradle | 6 +++--- build.gradle | 11 ++++++----- cashier/build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- merchant-lib/build.gradle | 7 +++---- merchant-terminal/build.gradle | 6 +++--- taler-kotlin-android/build.gradle | 9 ++++----- wallet/build.gradle | 12 ++++++------ 10 files changed, 37 insertions(+), 33 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9389bf3..fdae4ca 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -11,11 +11,15 @@ - + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b5fb24f..20236d7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -21,6 +21,7 @@ diff --git a/anastasis-ui/build.gradle b/anastasis-ui/build.gradle index 17e9530..4a66366 100644 --- a/anastasis-ui/build.gradle +++ b/anastasis-ui/build.gradle @@ -19,13 +19,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 + compileSdkVersion 30 //noinspection GradleDependency buildToolsVersion "$build_tools_version" defaultConfig { minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "0.1" @@ -67,7 +67,7 @@ dependencies { // ViewModel and LiveData implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" - testImplementation 'junit:junit:4.13' + testImplementation "junit:junit:$junit_version" androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/build.gradle b/build.gradle index 2deabf4..76ae6c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,13 @@ buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.21' ext.ktor_version = "1.4.0" - ext.nav_version = "2.3.0" + ext.nav_version = "2.3.3" ext.material_version = "1.2.1" ext.lifecycle_version = "2.2.0" - ext.constraintlayout_version = "2.0.2" + ext.constraintlayout_version = "2.0.4" + ext.junit_version = "4.13.1" // check https://android-rebuilds.beuc.net/ for availability of free build tools - ext.build_tools_version = "29.0.3" + ext.build_tools_version = "30.0.3" // should debug build types be minified with D8 as well? ext.minify_debug = false repositories { @@ -14,7 +15,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" diff --git a/cashier/build.gradle b/cashier/build.gradle index 337a427..5d2bc10 100644 --- a/cashier/build.gradle +++ b/cashier/build.gradle @@ -22,14 +22,14 @@ plugins { } android { - compileSdkVersion 29 + compileSdkVersion 30 //noinspection GradleDependency buildToolsVersion "$build_tools_version" defaultConfig { applicationId "net.taler.cashier" minSdkVersion 23 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -70,7 +70,7 @@ android { dependencies { implementation project(":taler-kotlin-android") implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - implementation 'androidx.security:security-crypto:1.0.0-rc03' // requires minSdk 23 + implementation 'androidx.security:security-crypto:1.0.0-rc04' // requires minSdk 23 implementation "com.google.android.material:material:$material_version" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" @@ -80,7 +80,7 @@ dependencies { implementation "io.ktor:ktor-client-okhttp:$ktor_version" implementation "io.ktor:ktor-client-serialization-jvm:$ktor_version" - testImplementation 'junit:junit:4.13' + testImplementation "junit:junit:$junit_version" androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 43ec45b..803791e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 29 10:20:17 BRT 2020 +#Thu Feb 04 11:18:01 BRT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle index 87bafd3..a173cce 100644 --- a/merchant-lib/build.gradle +++ b/merchant-lib/build.gradle @@ -17,18 +17,17 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-android-extensions' id 'kotlinx-serialization' } android { - compileSdkVersion 29 + compileSdkVersion 30 //noinspection GradleDependency buildToolsVersion "$build_tools_version" defaultConfig { minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "0.1" @@ -55,7 +54,7 @@ dependencies { api "io.ktor:ktor-client-okhttp:$ktor_version" api "io.ktor:ktor-client-serialization-jvm:$ktor_version" - testImplementation 'junit:junit:4.13' + testImplementation 'junit:junit:4.13.1' testImplementation "io.ktor:ktor-client-mock-jvm:$ktor_version" testImplementation "io.ktor:ktor-client-logging-jvm:$ktor_version" testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9' diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle index 318dcbd..0458f36 100644 --- a/merchant-terminal/build.gradle +++ b/merchant-terminal/build.gradle @@ -6,14 +6,14 @@ plugins { } android { - compileSdkVersion 29 + compileSdkVersion 30 //noinspection GradleDependency buildToolsVersion "$build_tools_version" defaultConfig { applicationId "net.taler.merchantpos" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 2 versionName "0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -69,7 +69,7 @@ dependencies { implementation "com.google.android.material:material:$material_version" implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" implementation "androidx.recyclerview:recyclerview:1.1.0" - implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc03" + implementation "androidx.recyclerview:recyclerview-selection:1.1.0" // Navigation implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle index eb299fe..2d423e8 100644 --- a/taler-kotlin-android/build.gradle +++ b/taler-kotlin-android/build.gradle @@ -17,18 +17,17 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-android-extensions' id 'kotlinx-serialization' } android { - compileSdkVersion 29 + compileSdkVersion 30 //noinspection GradleDependency buildToolsVersion "$build_tools_version" defaultConfig { minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "0.1" @@ -84,8 +83,8 @@ dependencies { // JSON parsing and serialization api "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC" - lintPublish 'com.github.thirdegg:lint-rules:0.0.5-alpha' + lintPublish 'com.github.thirdegg:lint-rules:0.0.6-alpha' - testImplementation 'junit:junit:4.13' + testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20200518' } diff --git a/wallet/build.gradle b/wallet/build.gradle index 9f5d018..abfdc07 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -39,14 +39,14 @@ def gitCommit = { -> } android { - compileSdkVersion 29 + compileSdkVersion 30 //noinspection GradleDependency buildToolsVersion "$build_tools_version" defaultConfig { applicationId "net.taler.wallet" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 8 versionName "v0.8.0-rc.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -115,13 +115,13 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.preference:preference-ktx:1.1.1' implementation "com.google.android.material:material:$material_version" implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" // Lists and Selection implementation "androidx.recyclerview:recyclerview:1.1.0" - implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc03" + implementation "androidx.recyclerview:recyclerview-selection:1.1.0" // Navigation Library implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" @@ -133,7 +133,7 @@ dependencies { // QR codes implementation 'com.journeyapps:zxing-android-embedded:4.0.2@aar' // needed to support zxing library in taler-kotlin-android on API < 24 - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' // Nicer ProgressBar implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1' @@ -144,7 +144,7 @@ dependencies { implementation "io.noties.markwon:ext-tables:$markwon_version" implementation "io.noties.markwon:recycler:$markwon_version" - testImplementation 'junit:junit:4.13' + testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20200518' androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' -- cgit v1.2.3