Browse Source

Android build system upgrades

* Upgrade Gradle plugin to 8.2.0
* Upgrade Gradle to 8.5
* Upgrade NDK to 26.1
* Move `buildFeatures` to Gradle build file, since using flag in `gradle.properties` is deprecated
pull/6861/head
Oleksandr Kalko 2 years ago committed by Anders Jenbo
parent
commit
1960aba49e
  1. 5
      android-project/app/build.gradle
  2. 2
      android-project/build.gradle
  3. 1
      android-project/gradle.properties
  4. 4
      android-project/gradle/wrapper/gradle-wrapper.properties

5
android-project/app/build.gradle

@ -7,7 +7,7 @@ if (buildAsApplication) {
} }
android { android {
ndkVersion '26.0.10792818' ndkVersion '26.1.10909125'
compileSdk 33 compileSdk 33
defaultConfig { defaultConfig {
if (buildAsApplication) { if (buildAsApplication) {
@ -31,6 +31,9 @@ android {
} }
} }
namespace 'org.diasurgical.devilutionx' namespace 'org.diasurgical.devilutionx'
buildFeatures {
buildConfig true
}
applicationVariants.all { variant -> applicationVariants.all { variant ->
tasks["merge${variant.name.capitalize()}Assets"] tasks["merge${variant.name.capitalize()}Assets"]
.dependsOn("externalNativeBuild${variant.name.capitalize()}") .dependsOn("externalNativeBuild${variant.name.capitalize()}")

2
android-project/build.gradle

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.1.4' classpath 'com.android.tools.build:gradle:8.2.0'
// 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

1
android-project/gradle.properties

@ -1,3 +1,2 @@
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false android.nonFinalResIds=false
android.nonTransitiveRClass=false android.nonTransitiveRClass=false

4
android-project/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@
#Sun Nov 26 11:32:45 EET 2023 #Wed Dec 13 13:49:58 EET 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Loading…
Cancel
Save