From 6ef5b189a399505ad5dceb948cedbcdca13aa3a9 Mon Sep 17 00:00:00 2001
From: Pinghao Wu <xdavidwuph@gmail.com>
Date: Sun, 23 Feb 2025 14:01:31 +0800
Subject: [PATCH] build: ndk 28, build-tools 35.0.1, openssl 3.4.1
---
Containerfile | 2 +-
build.gradle | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Containerfile b/Containerfile
index 0b06842..611aa22 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,7 +1,7 @@
FROM archlinux
RUN printf '[aurbuild]\nServer = https://aurbuild.xdavidwu.link\n' >> /etc/pacman.conf
-RUN curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf73f137d4573defaa097dbf09544cff6b08a3fd3' | pacman-key -a - && pacman-key --init && pacman-key --lsign-key f73f137d4573defaa097dbf09544cff6b08a3fd3 && pacman -Syu --noconfirm && pacman -S --noconfirm jdk21-openjdk android-sdk-cmdline-tools-latest android-platform-35 android-sdk-build-tools=r34.0.0-2 android-ndk android-aarch64-openssl clang cmake ninja python-yaml && rm /var/cache/pacman/pkg/* && mkdir /build
+RUN curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf73f137d4573defaa097dbf09544cff6b08a3fd3' | pacman-key -a - && pacman-key --init && pacman-key --lsign-key f73f137d4573defaa097dbf09544cff6b08a3fd3 && pacman -Syu --noconfirm && pacman -S --noconfirm jdk21-openjdk android-sdk-cmdline-tools-latest android-platform-35 android-sdk-build-tools=r35.0.1-1 android-ndk android-aarch64-openssl clang cmake ninja python-yaml && rm /var/cache/pacman/pkg/* && mkdir /build
WORKDIR /build
diff --git a/build.gradle b/build.gradle
index 3eb8790..973d0ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,9 +17,9 @@ repositories {
android {
namespace 'org.safcephfs'
compileSdkVersion 'android-35'
- buildToolsVersion '34'
+ buildToolsVersion '35.0.1'
ndkPath '/opt/android-ndk'
- ndkVersion '27.0.12077973'
+ ndkVersion '28.0.13004108'
defaultConfig {
minSdkVersion 26
@@ -49,7 +49,7 @@ android {
// agp weirdness: specify version to use system cmake
// https://developer.android.com/reference/tools/gradle-api/8.1/com/android/build/api/dsl/Cmake#version()
// TODO: use cmake from android-sdk?
- version '3.30.5'
+ version '3.31.5'
}
}
--
2.45.2