From 958ca10265e8109b65fd6a68f153648acb5c3564 Mon Sep 17 00:00:00 2001 From: julian Date: Wed, 24 Sep 2025 13:39:55 -0600 Subject: [PATCH] required 16KB android update --- android/build.gradle | 10 +++++----- scripts/android/build_all.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 659a560..6409a9e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,14 +4,14 @@ group 'com.example.frostdart' version '1.0' buildscript { - ext.kotlin_version = "1.8.22" + ext.kotlin_version = "2.2.20" repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.1.0") + classpath("com.android.tools.build:gradle:8.7.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") } } @@ -34,12 +34,12 @@ android { compileSdk = 34 compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 + jvmTarget = JavaVersion.VERSION_17 } sourceSets { diff --git a/scripts/android/build_all.sh b/scripts/android/build_all.sh index c81fd6b..485512b 100755 --- a/scripts/android/build_all.sh +++ b/scripts/android/build_all.sh @@ -1,6 +1,6 @@ #!/bin/bash -export API=25 +export API=28 WORKDIR="$(pwd)/"build export WORKDIR @@ -9,11 +9,11 @@ ROOT_DIR="$(pwd)/../.." mkdir -p build -export ANDROID_NDK_ZIP=${WORKDIR}/android-ndk-r25c.zip -export ANDROID_NDK_ROOT=${WORKDIR}/android-ndk-r25c -ANDROID_NDK_SHA256="53af80a1cce9144025b81c78c8cd556bff42bd0e" +export ANDROID_NDK_ZIP=${WORKDIR}/android-ndk-r28c.zip +export ANDROID_NDK_ROOT=${WORKDIR}/android-ndk-r28c +ANDROID_NDK_SHA256="a7b54a5de87fecd125a17d54f73c446199e72a64" if [ ! -e "$ANDROID_NDK_ZIP" ]; then - curl https://dl.google.com/android/repository/android-ndk-r25c-linux.zip -o "${ANDROID_NDK_ZIP}" + curl https://dl.google.com/android/repository/android-ndk-r28c-linux.zip -o "${ANDROID_NDK_ZIP}" fi echo $ANDROID_NDK_SHA256 "$ANDROID_NDK_ZIP" | sha1sum -c || exit 1 unzip "$ANDROID_NDK_ZIP" -d "$WORKDIR" @@ -45,7 +45,7 @@ cd build/serai/hrf || exit sed -i "s/\[dependencies\]/\[dependencies\]\\ openssl = { version = \"0.10\", features = [\"vendored\"] }/" Cargo.toml -rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android +rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android cargo ndk \ --target armv7-linux-androideabi \ --target aarch64-linux-android \