diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle | 14 | ||||
| -rw-r--r-- | android/build.gradle | 8 | ||||
| -rw-r--r-- | android/gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | android/native/build.gradle | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/android/app/build.gradle b/android/app/build.gradle index ce895edd1..407767249 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdkVersion 32 + buildToolsVersion '32.0.0' ndkVersion "$ndk_version" defaultConfig { applicationId 'net.minetest.minetest' minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 32 versionName "${versionMajor}.${versionMinor}.${versionPatch}" versionCode project.versionCode } @@ -87,12 +87,12 @@ task prepareAssets() { from "${projRoot}/textures" into "${assetsFolder}/textures" } - file("${assetsFolder}/.nomedia").text = ""; + file("${assetsFolder}/.nomedia").text = "" task zipAssets(type: Zip) { - archiveName "Minetest.zip" + archiveFileName = "Minetest.zip" from "${assetsFolder}" - destinationDir file("src/main/assets") + destinationDirectory = file("src/main/assets") } } @@ -112,5 +112,5 @@ android.applicationVariants.all { variant -> dependencies { implementation project(':native') - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.appcompat:appcompat:1.5.1' } diff --git a/android/build.gradle b/android/build.gradle index 8f3b90e7f..e4afab73d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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 buildscript { - ext.ndk_version = '23.2.8568313' + ext.ndk_version = '25.1.8937393' repositories { google() - jcenter() + mavenCentral() } 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' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -27,7 +27,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8ad73a75c..6b7fd26c8 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 diff --git a/android/native/build.gradle b/android/native/build.gradle index 90e4fe2e7..dc923bf3d 100644 --- a/android/native/build.gradle +++ b/android/native/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.library' apply plugin: 'de.undercouch.download' android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdkVersion 32 + buildToolsVersion '32.0.0' ndkVersion "$ndk_version" defaultConfig { minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 32 externalNativeBuild { ndkBuild { arguments '-j' + Runtime.getRuntime().availableProcessors(), |