aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle8
-rw-r--r--cashier/build.gradle3
-rw-r--r--merchant-terminal/build.gradle2
-rw-r--r--taler-kotlin-android/build.gradle4
-rw-r--r--wallet/build.gradle12
5 files changed, 11 insertions, 18 deletions
diff --git a/build.gradle b/build.gradle
index 98886f9..93d8a9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
buildscript {
ext {
- kotlin_version = '1.7.20'
- ktor_version = '2.1.0'
+ kotlin_version = '1.7.20' // observe compatibility with compose compiler
+ ktor_version = '2.1.3'
nav_version = '2.5.3'
material_version = '1.7.0'
lifecycle_version = '2.5.1'
constraintlayout_version = '2.1.4'
- compose_version = '1.3.0'
+ compose_version = '1.3.2'
junit_version = "4.13.2"
// check https://android-rebuilds.beuc.net/ for availability of free build tools
- build_tools_version = "33.0.0"
+ build_tools_version = "33.0.1"
// should debug build types be minified with D8 as well? good for catching issues early
minify_debug = true
}
diff --git a/cashier/build.gradle b/cashier/build.gradle
index cd64be5..ef0f1c3 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -90,7 +90,4 @@ dependencies {
implementation "io.ktor:ktor-server-call-logging:$ktor_version"
testImplementation "junit:junit:$junit_version"
-
- androidTestImplementation 'androidx.test.ext:junit:1.1.3'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 3d23c2a..5e72b15 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -76,6 +76,6 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
- testImplementation 'androidx.test.ext:junit:1.1.3'
+ testImplementation 'androidx.test.ext:junit:1.1.4'
testImplementation 'org.robolectric:robolectric:4.8.1'
}
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle
index 69d2b75..efd305f 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -26,8 +26,6 @@ android {
defaultConfig {
minSdkVersion 21
- targetSdkVersion 32
-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
}
@@ -72,7 +70,7 @@ dependencies {
implementation 'com.google.zxing:core:3.5.0' // needs minSdkVersion 24+ or desugar
// JSON parsing and serialization
- api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0'
+ api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20220320'
}
diff --git a/wallet/build.gradle b/wallet/build.gradle
index d93d971..729ad30 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -23,8 +23,8 @@ plugins {
id "de.undercouch.download" version "5.3.0"
}
-def walletCoreVersion = "v0.9.0"
-def walletCoreSha256 = "5a971f4b8faf8dce2cde6d720c7cf75f9233c399a164dcd98fb37a1b3b491c05"
+def walletCoreVersion = "v0.9.1-dev.1"
+def walletCoreSha256 = "dae4f51f87bed27fa2caa081c4cfdaaae04093eb782234dd716227af32b84e84"
static def versionCodeEpoch() {
return (new Date().getTime() / 1000).toInteger()
@@ -126,12 +126,12 @@ dependencies {
// Compose
implementation 'androidx.activity:activity-compose:1.6.1'
- implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.animation:animation:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version"
- implementation "androidx.compose.material:material-icons-extended:$compose_version"
+ implementation "androidx.compose.material:material:1.3.1"
+ implementation "androidx.compose.material:material-icons-extended:1.3.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
- implementation 'com.google.android.material:compose-theme-adapter:1.1.21'
+ implementation 'com.google.android.material:compose-theme-adapter:1.2.1'
// Lists and Selection
implementation "androidx.recyclerview:recyclerview:1.2.1"
@@ -160,8 +160,6 @@ dependencies {
testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20220320'
- androidTestImplementation 'androidx.test:runner:1.4.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
def walletLibraryDir = "src/main/assets"