Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 31, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down Expand Up @@ -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")
}
}

Expand All @@ -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'
}
8 changes: 4 additions & 4 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +27,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions android/native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down