diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index e6e41016b..279c2ed95 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -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) } } } diff --git a/android-project/build.gradle b/android-project/build.gradle index bcb07a1ff..5dcc0dc20 100644 --- a/android-project/build.gradle +++ b/android-project/build.gradle @@ -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