MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply suggested changes by Android Studio (#3287)

Browse source 
* Upgrade Gradle plugin to 7.0.3
* Upgrade compileSdkVersion to 30
* Remove androidResources block
This commit is contained in:
Oleksandr Kalko 2021-11-01 15:27:40 +02:00 • committed by GitHub
commit 30afa525e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
android-project/app/build.gradle
View file

@ -1,4 +1,4 @@
def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY')
def buildAsApplication = !buildAsLibrary
if (buildAsApplication) {
apply plugin: 'com.android.application'
@ -7,16 +7,13 @@ if (buildAsApplication) {
}
android {
compileSdkVersion 29 // Upgrade to 30 after november 2021
aaptOptions {
noCompress 'mpq'
}
compileSdkVersion 30
defaultConfig {
if (buildAsApplication) {
applicationId "org.diasurgical.devilutionx"
}
minSdkVersion 18
targetSdkVersion 29 // Upgrade to 30 after november 2021
targetSdkVersion 30
versionCode 20
versionName "1.3.0"
externalNativeBuild {
@ -50,8 +47,8 @@ android {
variant.outputs.each { output ->
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith(".aar")) {
def fileName = "org.diasurgical.devilutionx.aar";
output.outputFile = new File(outputFile.parent, fileName);
def fileName = "org.diasurgical.devilutionx.aar"
output.outputFile = new File(outputFile.parent, fileName)
}
}
}

2
android-project/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.0.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files