chore(android): update toolchain and deps

This commit is contained in:
Peter Steinberger
2025-12-14 02:30:59 +00:00
parent cf747e1b82
commit eaebf4b896
5 changed files with 116 additions and 145 deletions

View File

@@ -1,17 +1,18 @@
plugins { plugins {
id("com.android.application") id("com.android.application")
id("org.jetbrains.kotlin.android") id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose")
id("org.jetbrains.kotlin.plugin.serialization") id("org.jetbrains.kotlin.plugin.serialization")
} }
android { android {
namespace = "com.steipete.clawdis.node" namespace = "com.steipete.clawdis.node"
compileSdk = 34 compileSdk = 36
defaultConfig { defaultConfig {
applicationId = "com.steipete.clawdis.node" applicationId = "com.steipete.clawdis.node"
minSdk = 31 minSdk = 31
targetSdk = 34 targetSdk = 36
versionCode = 1 versionCode = 1
versionName = "0.1" versionName = "0.1"
} }
@@ -26,10 +27,6 @@ android {
compose = true compose = true
} }
composeOptions {
kotlinCompilerExtensionVersion = "1.5.14"
}
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
@@ -47,36 +44,36 @@ android {
} }
dependencies { dependencies {
val composeBom = platform("androidx.compose:compose-bom:2024.06.00") val composeBom = platform("androidx.compose:compose-bom:2025.12.00")
implementation(composeBom) implementation(composeBom)
androidTestImplementation(composeBom) androidTestImplementation(composeBom)
implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.core:core-ktx:1.17.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
implementation("androidx.activity:activity-compose:1.9.1") implementation("androidx.activity:activity-compose:1.12.1")
implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3") implementation("androidx.compose.material3:material3")
implementation("androidx.navigation:navigation-compose:2.7.7") implementation("androidx.navigation:navigation-compose:2.9.6")
debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-tooling")
// Material Components (XML theme + resources) // Material Components (XML theme + resources)
implementation("com.google.android.material:material:1.12.0") implementation("com.google.android.material:material:1.13.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
implementation("androidx.security:security-crypto:1.1.0-alpha06") implementation("androidx.security:security-crypto:1.1.0")
// CameraX (for node.invoke camera.* parity) // CameraX (for node.invoke camera.* parity)
implementation("androidx.camera:camera-core:1.3.4") implementation("androidx.camera:camera-core:1.5.2")
implementation("androidx.camera:camera-camera2:1.3.4") implementation("androidx.camera:camera-camera2:1.5.2")
implementation("androidx.camera:camera-lifecycle:1.3.4") implementation("androidx.camera:camera-lifecycle:1.5.2")
implementation("androidx.camera:camera-video:1.3.4") implementation("androidx.camera:camera-video:1.5.2")
implementation("androidx.camera:camera-view:1.3.4") implementation("androidx.camera:camera-view:1.5.2")
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
} }

View File

@@ -1,5 +1,6 @@
plugins { plugins {
id("com.android.application") version "8.6.1" apply false id("com.android.application") version "8.13.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.24" apply false id("org.jetbrains.kotlin.android") version "2.2.21" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.24" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.2.21" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.2.21" apply false
} }

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

29
apps/android/gradlew vendored
View File

@@ -112,33 +112,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
# Android Gradle Plugin requires a supported JDK (typically 17).
# On macOS, prefer JDK 17 when JAVA_HOME isn't set.
if [ "$darwin" = "true" ] && [ -z "$JAVA_HOME" ] ; then
if [ -x "/usr/libexec/java_home" ] ; then
jdk17=$(/usr/libexec/java_home -v 17 2>/dev/null)
if [ -n "$jdk17" ] && [ -d "$jdk17" ] ; then
JAVA_HOME=$jdk17
export JAVA_HOME
fi
fi
fi
# If the Android SDK isn't configured, try common default locations.
if [ -z "$ANDROID_SDK_ROOT" ] ; then
if [ -d "$HOME/Library/Android/sdk" ] ; then
ANDROID_SDK_ROOT="$HOME/Library/Android/sdk"
export ANDROID_SDK_ROOT
elif [ -d "$HOME/Android/Sdk" ] ; then
ANDROID_SDK_ROOT="$HOME/Android/Sdk"
export ANDROID_SDK_ROOT
fi
fi
if [ -z "$ANDROID_HOME" ] && [ -n "$ANDROID_SDK_ROOT" ] ; then
ANDROID_HOME="$ANDROID_SDK_ROOT"
export ANDROID_HOME
fi
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -227,7 +200,7 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,

View File

@@ -34,7 +34,7 @@ set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome