mirror of
				https://github.com/luanti-org/luanti.git
				synced 2025-11-04 09:15:29 +01:00 
			
		
		
		
	Android: Update to SDK 35 (#16513)
This commit is contained in:
		@@ -6,7 +6,7 @@ android {
 | 
			
		||||
		applicationId 'net.minetest.minetest'
 | 
			
		||||
		minSdkVersion 21
 | 
			
		||||
		compileSdk 34
 | 
			
		||||
		targetSdkVersion 34
 | 
			
		||||
		targetSdkVersion 35
 | 
			
		||||
		versionName "${versionMajor}.${versionMinor}.${versionPatch}"
 | 
			
		||||
		versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -15,8 +15,8 @@ buildscript {
 | 
			
		||||
		mavenCentral()
 | 
			
		||||
	}
 | 
			
		||||
	dependencies {
 | 
			
		||||
		classpath 'com.android.tools.build:gradle:8.5.1'
 | 
			
		||||
		classpath 'de.undercouch:gradle-download-task:4.1.1'
 | 
			
		||||
		classpath 'com.android.tools.build:gradle:8.12.3'
 | 
			
		||||
		classpath 'de.undercouch:gradle-download-task:5.6.0'
 | 
			
		||||
		// NOTE: Do not place your application dependencies here; they belong
 | 
			
		||||
		// in the individual module build.gradle files
 | 
			
		||||
	}
 | 
			
		||||
@@ -30,5 +30,5 @@ allprojects {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
task clean(type: Delete) {
 | 
			
		||||
	delete rootProject.buildDir
 | 
			
		||||
	delete rootProject.layout.buildDirectory
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
distributionBase=GRADLE_USER_HOME
 | 
			
		||||
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
 | 
			
		||||
validateDistributionUrl=true
 | 
			
		||||
zipStoreBase=GRADLE_USER_HOME
 | 
			
		||||
 
 | 
			
		||||
@@ -68,5 +68,5 @@ if (new File(depsDir, 'armeabi-v7a').exists()) {
 | 
			
		||||
preBuild.dependsOn getDeps
 | 
			
		||||
 | 
			
		||||
clean {
 | 
			
		||||
	delete new File(buildDir.parent, 'deps')
 | 
			
		||||
	delete depsDir
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -77,30 +77,28 @@ some shader settings cannot be used on OpenGL ES.
 | 
			
		||||
Changing the graphic driver setting to OpenGL will not work.
 | 
			
		||||
 | 
			
		||||
## 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
 | 
			
		||||
* Android NDK r21
 | 
			
		||||
* Android Studio 3 [optional]
 | 
			
		||||
In order to build, you will need the following development tools:
 | 
			
		||||
 | 
			
		||||
* Java JDK
 | 
			
		||||
* Android SDK
 | 
			
		||||
* `gettext` command line tools
 | 
			
		||||
* Android Studio [optional]
 | 
			
		||||
 | 
			
		||||
Additionally, you'll need to have an Internet connection available on the
 | 
			
		||||
build system, as the Android build will download some source packages.
 | 
			
		||||
 | 
			
		||||
## Build
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
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.
 | 
			
		||||
 | 
			
		||||
When using gradlew, the newest NDK will be downloaded and installed
 | 
			
		||||
automatically. Or you can create a `local.properties` file and specify
 | 
			
		||||
`sdk.dir` and `ndk.dir` yourself.
 | 
			
		||||
automatically. You have to create a `local.properties` file and specify
 | 
			
		||||
`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
 | 
			
		||||
  the resulting apk package. How this is done is not part of this README. There
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user