Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-08-18 20:44:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Android: Increase target/compiled SDK version to 32 (#12911)

Browse Source 
Build Tools, NDK, and Gradle are also updated.
Repositories is changed from jcenter() to mavenCentral().
This commit is contained in:
Muhammad Rifqi Priyo Susanto 2022-10-31 20:19:30 +07:00 committed by GitHub
parent 987277de52
commit fb3085a2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
android/app/build.gradle
View File

@ -1,12 +1,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 30 compileSdkVersion 32
buildToolsVersion '30.0.3' buildToolsVersion '32.0.0'
ndkVersion "$ndk_version" ndkVersion "$ndk_version"
defaultConfig { defaultConfig {
applicationId 'net.minetest.minetest' applicationId 'net.minetest.minetest'
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 32
versionName "${versionMajor}.${versionMinor}.${versionPatch}" versionName "${versionMajor}.${versionMinor}.${versionPatch}"
versionCode project.versionCode versionCode project.versionCode
} }
@ -87,12 +87,12 @@ task prepareAssets() {
from "${projRoot}/textures" into "${assetsFolder}/textures" from "${projRoot}/textures" into "${assetsFolder}/textures"
} }
file("${assetsFolder}/.nomedia").text = ""; file("${assetsFolder}/.nomedia").text = ""
task zipAssets(type: Zip) { task zipAssets(type: Zip) {
archiveName "Minetest.zip" archiveFileName = "Minetest.zip"
from "${assetsFolder}" from "${assetsFolder}"
destinationDir file("src/main/assets") destinationDirectory = file("src/main/assets")
} }
} }
@ -112,5 +112,5 @@ android.applicationVariants.all { variant ->
dependencies { dependencies {
implementation project(':native') implementation project(':native')
implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.appcompat:appcompat:1.5.1'
} }

8
android/build.gradle
View File

@ -11,13 +11,13 @@ project.ext.set("developmentBuild", 1) // Whether it is a development build, or
// each APK must have a larger `versionCode` than the previous // each APK must have a larger `versionCode` than the previous
buildscript { buildscript {
ext.ndk_version = '23.2.8568313' ext.ndk_version = '25.1.8937393'
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.3' classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'de.undercouch:gradle-download-task:4.1.1' classpath 'de.undercouch:gradle-download-task:4.1.1'
// 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
@ -27,7 +27,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

6
android/native/build.gradle
View File

@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
apply plugin: 'de.undercouch.download' apply plugin: 'de.undercouch.download'
android { android {
compileSdkVersion 30 compileSdkVersion 32
buildToolsVersion '30.0.3' buildToolsVersion '32.0.0'
ndkVersion "$ndk_version" ndkVersion "$ndk_version"
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 32
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {
arguments '-j' + Runtime.getRuntime().availableProcessors(), arguments '-j' + Runtime.getRuntime().availableProcessors(),