Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand All @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions scripts/android/build_all.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export API=25
export API=28

WORKDIR="$(pwd)/"build
export WORKDIR
Expand All @@ -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"
Expand Down Expand Up @@ -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 \
Expand Down