aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--anastasis-ui/build.gradle4
-rw-r--r--build.gradle12
-rw-r--r--merchant-lib/build.gradle6
-rw-r--r--merchant-terminal/build.gradle6
-rw-r--r--taler-kotlin-android/build.gradle18
-rw-r--r--wallet/build.gradle25
6 files changed, 34 insertions, 37 deletions
diff --git a/anastasis-ui/build.gradle b/anastasis-ui/build.gradle
index 2275496..4d30ee5 100644
--- a/anastasis-ui/build.gradle
+++ b/anastasis-ui/build.gradle
@@ -72,6 +72,6 @@ dependencies {
testImplementation "junit:junit:$junit_version"
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
diff --git a/build.gradle b/build.gradle
index 7c7f3a4..b274284 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,9 @@
buildscript {
- ext.kotlin_version = '1.5.31'
- ext.ktor_version = "1.6.3"
- ext.nav_version = '2.4.1'
- ext.material_version = "1.4.0"
- ext.lifecycle_version = "2.4.0"
- ext.constraintlayout_version = "2.1.2"
+ ext.ktor_version = '2.0.1'
+ ext.nav_version = '2.4.2'
+ ext.material_version = '1.6.0'
+ ext.lifecycle_version = '2.4.1'
+ ext.constraintlayout_version = '2.1.3'
ext.junit_version = "4.13.2"
// check https://android-rebuilds.beuc.net/ for availability of free build tools
ext.build_tools_version = "30.0.3"
@@ -25,7 +24,6 @@ buildscript {
allprojects {
repositories {
google()
- jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle
index d388b27..c554b77 100644
--- a/merchant-lib/build.gradle
+++ b/merchant-lib/build.gradle
@@ -21,13 +21,13 @@ plugins {
}
android {
- compileSdkVersion 30
+ compileSdkVersion 32
//noinspection GradleDependency
buildToolsVersion "$build_tools_version"
defaultConfig {
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
@@ -61,5 +61,5 @@ dependencies {
testImplementation "junit:junit:$junit_version"
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.5.1'
+ testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
}
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 19b0136..00fe568 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -6,14 +6,14 @@ plugins {
}
android {
- compileSdkVersion 31
+ compileSdkVersion 32
//noinspection GradleDependency
buildToolsVersion "$build_tools_version"
defaultConfig {
applicationId "net.taler.merchantpos"
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 32
versionCode 2
versionName "0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -78,5 +78,5 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
testImplementation 'androidx.test.ext:junit:1.1.3'
- testImplementation 'org.robolectric:robolectric:4.4'
+ testImplementation 'org.robolectric:robolectric:4.8.1'
}
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle
index e45a3a1..e47efe9 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -21,13 +21,13 @@ plugins {
}
android {
- compileSdkVersion 31
+ compileSdkVersion 32
//noinspection GradleDependency
buildToolsVersion "$build_tools_version"
defaultConfig {
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
@@ -60,8 +60,8 @@ android {
dependencies {
api project(":multiplatform:common")
- implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation 'androidx.core:core-ktx:1.6.0'
+ implementation 'androidx.appcompat:appcompat:1.4.1'
+ implementation 'androidx.core:core-ktx:1.7.0'
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
// Navigation
@@ -72,20 +72,20 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
// QR codes
- implementation 'com.google.zxing:core:3.4.0' // needs minSdkVersion 24+ or desugar
+ implementation 'com.google.zxing:core:3.5.0' // needs minSdkVersion 24+ or desugar
// Logcat viewer
- implementation('com.github.pedrovgs:lynx:1.1.0') {
+ implementation('com.github.pedrovgs:lynx:1.6') {
exclude group: 'com.android.support'
exclude group: 'com.squareup'
}
- implementation 'com.github.pedrovgs:renderers:4.0.0'
+ implementation 'com.github.pedrovgs:renderers:4.1.0'
// JSON parsing and serialization
- api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2"
+ api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
lintPublish 'com.github.thirdegg:lint-rules:0.0.6-beta'
testImplementation "junit:junit:$junit_version"
- testImplementation 'org.json:json:20200518'
+ testImplementation 'org.json:json:20220320'
}
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 2aaea01..20bdd49 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -39,14 +39,13 @@ def gitCommit = { ->
}
android {
- compileSdkVersion 31
- //noinspection GradleDependency
+ compileSdkVersion 32
buildToolsVersion "$build_tools_version"
defaultConfig {
applicationId "net.taler.wallet"
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 32
versionCode 11
versionName walletCoreVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -122,20 +121,20 @@ dependencies {
implementation project(":anastasis-ui")
implementation 'net.taler:akono:0.2'
- implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.0"
- implementation 'androidx.preference:preference-ktx:1.1.1'
+ implementation 'androidx.preference:preference-ktx:1.2.0'
implementation "com.google.android.material:material:$material_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
// Compose
implementation 'androidx.activity:activity-compose:1.4.0'
- implementation 'androidx.compose.material:material:1.0.5'
- implementation 'androidx.compose.animation:animation:1.0.5'
- implementation 'androidx.compose.ui:ui-tooling:1.0.5'
- implementation 'androidx.compose.material:material-icons-extended:1.0.5'
+ implementation 'androidx.compose.material:material:1.1.1'
+ implementation 'androidx.compose.animation:animation:1.1.1'
+ implementation 'androidx.compose.ui:ui-tooling:1.1.1'
+ implementation 'androidx.compose.material:material-icons-extended:1.1.1'
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
- implementation "com.google.android.material:compose-theme-adapter:1.1.1"
+ implementation 'com.google.android.material:compose-theme-adapter:1.1.9'
// Lists and Selection
implementation "androidx.recyclerview:recyclerview:1.2.1"
@@ -149,7 +148,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
// QR codes
- implementation 'com.journeyapps:zxing-android-embedded:4.0.2@aar'
+ implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
// needed to support zxing library in taler-kotlin-android on API < 24
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
@@ -157,13 +156,13 @@ dependencies {
implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
// Markdown rendering
- final def markwon_version = '4.6.0'
+ final def markwon_version = '4.6.2'
implementation "io.noties.markwon:core:$markwon_version"
implementation "io.noties.markwon:ext-tables:$markwon_version"
implementation "io.noties.markwon:recycler:$markwon_version"
testImplementation "junit:junit:$junit_version"
- testImplementation 'org.json:json:20200518'
+ testImplementation 'org.json:json:20220320'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 07:36:39 +0000