Skip to content

Commit

Permalink
Thank you refreshing my memory!
Browse files Browse the repository at this point in the history
Thanks, nulldoubt, for saving Android builds in this release! There needs to be a property enabled to use AndroidX; this does that now. This also runs ktlint.
  • Loading branch information
tommyettinger committed Oct 18, 2024
1 parent 4760d6c commit f52ed5c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/main/kotlin/gdx/liftoff/data/platforms/Android.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Android : Platform {
override val order = ORDER
override val isStandard = false // user should only jump through android hoops on request
override fun initiate(project: Project) {
project.properties["android.useAndroidX"] = "true"
project.properties["android.enableR8.fullMode"] = "false"
addGradleTaskDescription(project, "lint", "performs Android project validation.")

Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/gdx/liftoff/data/project/Data.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ data class AdvancedProjectData(
*/
val gwtVersion: String
get() = if (javaVersion.removeSurrounding("1.", ".0").toDouble().compareTo(8.0) >= 0 ||
(gdxVersion.startsWith("1.13."))) {
(gdxVersion.startsWith("1.13."))
) {
"2.11.0"
} else if (gdxVersion.length == 5 && gdxVersion[4] != '9') {
if (gdxVersion[4] < '5') "2.6.1" else "2.8.0"
Expand Down

0 comments on commit f52ed5c

Please sign in to comment.