Skip to content

Commit

Permalink
Android build system upgrades
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
tsunamistate authored and AJenbo committed Dec 13, 2023
1 parent 7c1688b commit 1960aba
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
5 changes: 4 additions & 1 deletion android-project/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if (buildAsApplication) {
}

android {
ndkVersion '26.0.10792818'
ndkVersion '26.1.10909125'
compileSdk 33
defaultConfig {
if (buildAsApplication) {
Expand All @@ -31,6 +31,9 @@ android {
}
}
namespace 'org.diasurgical.devilutionx'
buildFeatures {
buildConfig true
}
applicationVariants.all { variant ->
tasks["merge${variant.name.capitalize()}Assets"]
.dependsOn("externalNativeBuild${variant.name.capitalize()}")
Expand Down
2 changes: 1 addition & 1 deletion android-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
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
// in the individual module build.gradle files
Expand Down
1 change: 0 additions & 1 deletion android-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
4 changes: 2 additions & 2 deletions android-project/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Nov 26 11:32:45 EET 2023
#Wed Dec 13 13:49:58 EET 2023
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists

0 comments on commit 1960aba

Please sign in to comment.