Skip to content

Commit

Permalink
Use my fork of LML for now.
Browse files Browse the repository at this point in the history
The classpath scanner, which I don't even claim to understand, is broken in the current official LML fork, so I reverted to the one Liftoff currently uses and also updated the scene2d.ui code for libGDX 1.12.0's breaking changes.
  • Loading branch information
tommyettinger committed Jul 3, 2023
1 parent 9af3495 commit f99d465
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 12 deletions.
18 changes: 12 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,18 @@ dependencies {
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
implementation "com.crashinvaders.lml:gdx-kiwi:$lmlVersion"
implementation "com.crashinvaders.lml:gdx-lml:$lmlVersion"
implementation "com.crashinvaders.lml:gdx-lml-vis:$lmlVersion"
implementation "com.crashinvaders.lml:gdx-autumn:$lmlVersion"
implementation "com.crashinvaders.lml:gdx-autumn-fcs:$lmlVersion"
implementation "com.crashinvaders.lml:gdx-autumn-mvc:$lmlVersion"
implementation "com.github.tommyettinger.gdx-lml:gdx-kiwi:$lmlVersion"
implementation "com.github.tommyettinger.gdx-lml:gdx-lml:$lmlVersion"
implementation "com.github.tommyettinger.gdx-lml:gdx-lml-vis:$lmlVersion"
implementation "com.github.tommyettinger.gdx-lml:gdx-autumn:$lmlVersion"
implementation "com.github.tommyettinger.gdx-lml:gdx-autumn-fcs:$lmlVersion"
implementation "com.github.tommyettinger.gdx-lml:gdx-autumn-mvc:$lmlVersion"
// implementation "com.crashinvaders.lml:gdx-kiwi:$lmlVersion"
// implementation "com.crashinvaders.lml:gdx-lml:$lmlVersion"
// implementation "com.crashinvaders.lml:gdx-lml-vis:$lmlVersion"
// implementation "com.crashinvaders.lml:gdx-autumn:$lmlVersion"
// implementation "com.crashinvaders.lml:gdx-autumn-fcs:$lmlVersion"
// implementation "com.crashinvaders.lml:gdx-autumn-mvc:$lmlVersion"
implementation "com.kotcrab.vis:vis-ui:$visUiVersion"

implementation "org.lwjgl:lwjgl-nfd:$lwjgl3Version"
Expand Down
8 changes: 6 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
kotlinVersion=1.7.22
gdxVersion=1.11.0
gdxVersion=1.12.0
# doesn't work with any version
#lmlVersion=1.10.1.11.0
lmlVersion=1.9.1.10.0
# doesn't work with 1.12.0
#lmlVersion=1.9.1.10.0
# might work? self-built
lmlVersion=fba87de689
visUiVersion=1.5.1
commonsExecVersion=1.3
lwjgl3Version=3.3.1
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class GlobalActionContainer : ActionContainer {
}

@LmlAction("androidPluginVersion")
fun getDefaultAndroidPluginVersion(): String = "7.3.0"
fun getDefaultAndroidPluginVersion(): String = "7.4.2"

@LmlAction("roboVMVersion")
fun getDefaultRoboVMVersion(): String = "2.3.16"
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/gdx/liftoff/data/platforms/Android.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Android : Platform {
override fun initiate(project: Project) {
project.rootGradle.buildDependencies.add("\"com.android.tools.build:gradle:\$androidPluginVersion\"")
project.properties["androidPluginVersion"] = project.advanced.androidPluginVersion

project.properties["android.useAndroidX"] = "true"
addGradleTaskDescription(project, "lint", "performs Android project validation.")

addCopiedFile(project, "ic_launcher-web.png")
Expand Down Expand Up @@ -185,7 +185,7 @@ dependencies {
(
if (agpVersion[0] < 7 || (agpVersion[0] == 7) && agpVersion[1] < 3) "1.1.5"
else if (agpVersion[0] == 7 && agpVersion[1] == 3) "1.2.2"
else "2.0.0"
else "2.0.3"
) + "'" else ""}
${joinDependencies(dependencies)}
${joinDependencies(nativeDependencies, "natives")}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gdx/liftoff/data/project/project.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Project(
val rootGradle: RootGradleFile
val properties = mutableMapOf(
"org.gradle.daemon" to "true",
"org.gradle.jvmargs" to "-Xms512M -Xmx1G -XX:MaxMetaspaceSize=1G",
"org.gradle.jvmargs" to "-Xms512M -Xmx1G",
"org.gradle.configureondemand" to "false"
)
val gwtInherits = mutableSetOf<String>()
Expand Down

0 comments on commit f99d465

Please sign in to comment.