diff --git a/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java b/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java index 95cd324fe..a7445777d 100644 --- a/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java +++ b/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java @@ -54,8 +54,7 @@ public class ControllerHandler implements ControllerListener { } public static boolean controllersSupported() { - //disabled on iOS as a temporary workaround for dependency issues between RoboVM and gdx-controllers - if (DeviceCompat.isiOS() || (DeviceCompat.isAndroid() && Gdx.app.getVersion() < 16)) { + if (DeviceCompat.isAndroid() && Gdx.app.getVersion() < 16) { return false; } else { return true; diff --git a/build.gradle b/build.gradle index b80878df6..f52d177ea 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { appAndroidTargetSDK = 31 gdxVersion = '1.11.0' - gdxControllersVersion = '2.2.1' + gdxControllersVersion = '2.2.2' robovmVersion = '2.3.16' } version = appVersionName diff --git a/desktop/build.gradle b/desktop/build.gradle index e999d4231..0eb48fc3c 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -120,10 +120,6 @@ dependencies { implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion" - //temporary workaround for gdx-controllers-2.2.1 using outdated jamepad version - implementation("com.badlogicgames.jamepad:jamepad:2.0.20.0") { - exclude group: 'com.badlogicgames.gdx', module: 'gdx-jnigen-loader' - } //we use LWJGL tinyFD directly to display crash messages implementation "org.lwjgl:lwjgl-tinyfd:3.3.1"