oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Android: Update to SDK 35 (#16513)

Browse source
This commit is contained in:
sfan5 2025-09-29 13:25:23 +02:00 • committed by GitHub
parent e3ec044ed0
commit 8f98b4f243
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -6,7 +6,7 @@ android {
applicationId 'net.minetest.minetest' applicationId 'net.minetest.minetest'
minSdkVersion 21 minSdkVersion 21
compileSdk 34 compileSdk 34
targetSdkVersion 34 targetSdkVersion 35
versionName "${versionMajor}.${versionMinor}.${versionPatch}" versionName "${versionMajor}.${versionMinor}.${versionPatch}"
versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
} }

6
android/build.gradle
View file

@ -15,8 +15,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.5.1' classpath 'com.android.tools.build:gradle:8.12.3'
classpath 'de.undercouch:gradle-download-task:4.1.1' classpath 'de.undercouch:gradle-download-task:5.6.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
@ -30,5 +30,5 @@ allprojects {
} }
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.layout.buildDirectory
} }

2
android/gradle/wrapper/gradle-wrapper.properties vendored
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-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
android/native/build.gradle
View file

@ -68,5 +68,5 @@ if (new File(depsDir, 'armeabi-v7a').exists()) {
preBuild.dependsOn getDeps preBuild.dependsOn getDeps
clean { clean {
delete new File(buildDir.parent, 'deps') delete depsDir
} }

22
doc/android.md
View file

@ -77,30 +77,28 @@ some shader settings cannot be used on OpenGL ES.
Changing the graphic driver setting to OpenGL will not work. Changing the graphic driver setting to OpenGL will not work.
## Building Requirements ## Building Requirements
In order to build, your PC has to be set up to build Luanti in the usual
manner (see the regular Luanti documentation for how to get this done).
In addition to what is required for Luanti in general, you will need the
following software packages. The version number in parenthesis denotes the
version that was tested at the time this README was drafted; newer/older
versions may or may not work.
* Android SDK 29 In order to build, you will need the following development tools:
* Android NDK r21
* Android Studio 3 [optional] * Java JDK
* Android SDK
* `gettext` command line tools
* Android Studio [optional]
Additionally, you'll need to have an Internet connection available on the Additionally, you'll need to have an Internet connection available on the
build system, as the Android build will download some source packages. build system, as the Android build will download some source packages.
## Build ## Build
The new build system Luanti Android is fully functional and is designed to The new build system Luanti Android is fully functional and is designed to
speed up and simplify the work, as well as adding the possibility of speed up and simplify the work, as well as adding the possibility of
cross-platform build. cross-platform build.
You can use `./gradlew assemblerelease` or `./gradlew assembledebug` from the You can use `./gradlew assembleRelease` or `./gradlew assembleDebug` from the
command line or use Android Studio and click the build button. command line or use Android Studio and click the build button.
When using gradlew, the newest NDK will be downloaded and installed When using gradlew, the newest NDK will be downloaded and installed
automatically. Or you can create a `local.properties` file and specify automatically. You have to create a `local.properties` file and specify
`sdk.dir` and `ndk.dir` yourself. `sdk.dir` yourself if you want to use an existing installation.
* In order to make a release build you'll have to have a keystore setup to sign * In order to make a release build you'll have to have a keystore setup to sign
the resulting apk package. How this is done is not part of this README. There the resulting apk package. How this is done is not part of this README. There