commit c01c2865b8408702761386c5c7a4736abba20d46
parent 281f69ac257218c6495fa498ebe5440fe22d4b93
Author: Iván Ávalos <avalos@disroot.org>
Date: Sat, 9 May 2026 16:09:27 +0200
android: java 17 -> 21, bump Debian/Node.js
Diffstat:
6 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/QuickJS-android/build.gradle.kts b/QuickJS-android/build.gradle.kts
@@ -1,14 +1,7 @@
-buildscript {
- val agp_version by extra("8.9.2")
- repositories {
- google()
- mavenCentral()
- }
- dependencies {
- classpath("com.android.tools.build:gradle:$agp_version")
- classpath(kotlin("gradle-plugin", version = "2.1.20"))
- classpath("com.vanniktech:gradle-maven-publish-plugin:0.31.0")
- }
+plugins {
+ id("com.android.library") version "9.1.1" apply false
+ id("org.jetbrains.kotlin.android") version "2.3.21" apply false
+ id("com.vanniktech.maven.publish") version "0.36.0"
}
allprojects {
diff --git a/QuickJS-android/gradle/wrapper/gradle-wrapper.properties b/QuickJS-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 12 17:04:32 CEST 2025
+#Fri May 08 19:19:57 CEST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/QuickJS-android/qtart/build.gradle.kts b/QuickJS-android/qtart/build.gradle.kts
@@ -1,16 +1,14 @@
-import com.vanniktech.maven.publish.SonatypeHost
plugins {
id("com.android.library")
id("com.vanniktech.maven.publish")
- kotlin("android")
}
val walletCoreVersion = System.getenv()["WALLET_CORE_VERSION"]
android {
namespace = "net.taler.qtart"
- compileSdk = 35
+ compileSdk = 37
defaultConfig {
minSdk = 24
@@ -26,8 +24,12 @@ android {
}
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
+ }
+
+ kotlin {
+ jvmToolchain(21)
}
buildFeatures {
@@ -36,7 +38,7 @@ android {
}
dependencies {
- implementation("net.java.dev.jna:jna:5.17.0@aar")
+ implementation("net.java.dev.jna:jna:5.18.1@aar")
}
// Only sign when MAVEN_PUBLISH is set in the environment
@@ -45,7 +47,6 @@ tasks.withType<Sign>().configureEach {
}
mavenPublishing {
- publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL,
- automaticRelease = System.getenv().containsKey("MAVEN_PUBLISH"))
+ publishToMavenCentral(automaticRelease = System.getenv().containsKey("MAVEN_PUBLISH"))
signAllPublications()
-}
-\ No newline at end of file
+}
diff --git a/QuickJS-android/settings.gradle.kts b/QuickJS-android/settings.gradle.kts
@@ -1,11 +1,13 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/5.2.1/userguide/multi_project_builds.html
- */
+pluginManagement {
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
+plugins {
+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
rootProject.name = "qtart"
diff --git a/docker-android/Dockerfile b/docker-android/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
ENV LANG=C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive
diff --git a/docker-android/install.sh b/docker-android/install.sh
@@ -13,13 +13,19 @@ apt-get install -y --allow-downgrades \
jq \
make \
meson \
- npm \
unzip \
wget \
zip
+# install Node.js (official)
+curl -fsSL https://deb.nodesource.com/setup_24.x | bash
+apt-get install -y nodejs
+node -v
+npm -v
+
+
# Needed to build wallet-core
-npm install -g pnpm@9.7.0
+npm install -g pnpm@11.0.8
# Install Android SDK Manager
wget --no-verbose -O cmdline-tools.zip \
