commit 85af159b090525ea62f166d5b65e57d5d15b34ad
parent 24e0cfa165fea864ceec5907f392358960845fd5
Author: Iván Ávalos <avalos@disroot.org>
Date: Wed, 25 Feb 2026 15:09:09 +0100
[common] Bump Gradle dependencies
Diffstat:
6 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
@@ -6,7 +6,6 @@
<GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,14 @@
buildscript {
ext {
kotlin_version = '2.2.20' // observe compatibility with compose compiler
- ktor_version = '3.3.1'
- nav_version = '2.9.5'
+ ktor_version = '3.4.0'
+ nav_version = '2.9.7'
material_version = '1.13.0'
- lifecycle_version = '2.9.4'
+ lifecycle_version = '2.10.0'
constraintlayout_version = '2.2.1'
junit_version = "4.13.2"
datastore_version = "1.1.1"
+ protobuf_version = "0.9.6"
// should debug build types be minified with D8 as well? good for catching issues early
minify_debug = false
}
@@ -16,7 +17,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.13.0'
+ classpath 'com.android.tools.build:gradle:8.13.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/donau-verificator/build.gradle b/donau-verificator/build.gradle
@@ -7,12 +7,7 @@ static def versionCodeEpoch() {
}
def gitCommit = { ->
- def stdout = new ByteArrayOutputStream()
- exec {
- commandLine 'git', 'rev-parse', '--short=7', 'HEAD'
- standardOutput = stdout
- }
- return stdout.toString().trim()
+ return 'git rev-parse --short=7 HEAD'.execute().text.trim()
}
android {
@@ -30,7 +25,10 @@ android {
buildConfigField "boolean", "ALLOW_INSECURE_HTTP", "true"
manifestPlaceholders = [usesCleartextTraffic: "true"]
- archivesBaseName = "donau-verificator"
+ base {
+ archivesName = "donau-verificator"
+ }
+
externalNativeBuild {
cmake {
cppFlags ''
@@ -121,10 +119,10 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'com.google.android.material:material:1.13.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
- implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.4'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
- implementation 'androidx.navigation:navigation-fragment:2.9.5'
- implementation 'androidx.navigation:navigation-ui:2.9.5'
+ implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.10.0'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
+ implementation 'androidx.navigation:navigation-fragment:2.9.7'
+ implementation 'androidx.navigation:navigation-ui:2.9.7'
implementation 'com.github.yuriy-budiyev:code-scanner:2.3.2'
// https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.70'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Oct 31 21:28:49 CET 2025
+#Wed Feb 25 13:18:29 CET 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,14 @@
+pluginManagement {
+ repositories {
+ gradlePluginPortal()
+ }
+}
+
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+
include ':donau-verificator'
include ':cashier', ':merchant-terminal', ':wallet'
include ':taler-kotlin-android'
-include ':merchant-lib'
+include ':merchant-lib'
+\ No newline at end of file
diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -20,7 +20,7 @@ plugins {
id "com.android.application"
id "kotlin-android"
id "kotlinx-serialization"
- id "com.google.protobuf" version "0.9.5"
+ id "com.google.protobuf" version "$protobuf_version"
id "org.jetbrains.kotlin.plugin.compose" version "$kotlin_version"
}
@@ -29,13 +29,9 @@ def qtart_version = "1.3.10"
static def versionCodeEpoch() {
return (new Date().getTime() / 1000).toInteger()
}
+
def gitCommit = { ->
- def stdout = new ByteArrayOutputStream()
- exec {
- commandLine 'git', 'rev-parse', '--short=7', 'HEAD'
- standardOutput = stdout
- }
- return stdout.toString().trim()
+ return 'git rev-parse --short=7 HEAD'.execute().text.trim()
}
android {
@@ -134,13 +130,13 @@ dependencies {
implementation "androidx.biometric:biometric-ktx:1.4.0-alpha02"
// Compose
- implementation platform('androidx.compose:compose-bom:2025.10.01')
+ implementation platform('androidx.compose:compose-bom:2026.02.00')
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material:material-icons-extended'
implementation "androidx.compose.runtime:runtime-livedata"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose"
implementation "com.google.accompanist:accompanist-themeadapter-material3:0.36.0"
- implementation 'androidx.activity:activity-compose:1.11.0'
+ implementation 'androidx.activity:activity-compose:1.12.4'
implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.ui:ui-viewbinding'
implementation "androidx.fragment:fragment-compose:1.8.9"
@@ -176,10 +172,10 @@ dependencies {
// Shared preferences
implementation "androidx.datastore:datastore:$datastore_version"
- implementation "com.google.protobuf:protobuf-javalite:3.18.0"
+ implementation "com.google.protobuf:protobuf-javalite:4.33.5"
testImplementation "junit:junit:$junit_version"
- testImplementation 'org.json:json:20250517'
+ testImplementation 'org.json:json:20251224'
}
tasks.withType(KotlinCompile).configureEach {
