~xdavidwu/saf-cephfs

0bdbe50127df072fde26a56285f61d9bc4eabb9b — Pinghao Wu 2 months ago 27802fc
build: jdk 21, bump gradle and agp for compatibility
3 files changed, 5 insertions(+), 3 deletions(-)

M Containerfile
M build.gradle
M gradle/wrapper/gradle-wrapper.properties
M Containerfile => Containerfile +1 -1
@@ 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 jdk17-openjdk android-sdk-cmdline-tools-latest android-platform-33 android-sdk-build-tools-33 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-33 android-sdk-build-tools-33 android-ndk android-aarch64-openssl clang cmake ninja python-yaml && rm /var/cache/pacman/pkg/* && mkdir /build

WORKDIR /build


M build.gradle => build.gradle +3 -1
@@ 4,15 4,17 @@ buildscript {
		mavenCentral()
	}
	dependencies {
		classpath 'com.android.tools.build:gradle:7.3.0'
		classpath 'com.android.tools.build:gradle:8.0.2'
	}
}
apply plugin: 'com.android.application'

android {
	namespace 'org.safcephfs'
	compileSdkVersion 'android-33'
	buildToolsVersion '33'
	ndkPath '/opt/android-ndk'
	ndkVersion '27.0.12077973'

	defaultConfig {
		minSdkVersion 24

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