diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index c9027f8..c09908c 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -14,11 +14,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build Android
@@ -30,4 +30,4 @@ jobs:
     - name: Build GWT
       run: ./gradlew :test:html:build
     - name: Local install
-      run: ./gradlew uploadArchives -PLOCAL=true
+      run: ./gradlew publishToMavenLocal
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 5bf09b2..c73cbbc 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -11,11 +11,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build Android
@@ -37,4 +37,4 @@ jobs:
         NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
         NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
       run:
-        ./gradlew clean uploadArchives -PRELEASE=true -Psigning.gnupg.keyId=${{ secrets.GPG_KEYID }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Psigning.gnupg.keyName=${{ secrets.GPG_KEYID }}
+        ./gradlew clean publish -PRELEASE=true -Psigning.gnupg.keyId=${{ secrets.GPG_KEYID }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Psigning.gnupg.keyName=${{ secrets.GPG_KEYID }}
diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
index 14d4832..c0dabee 100644
--- a/.github/workflows/publish_snapshot.yml
+++ b/.github/workflows/publish_snapshot.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build Android
@@ -31,4 +31,4 @@ jobs:
       env:
         NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
         NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-      run: ./gradlew uploadArchives
+      run: ./gradlew publish
diff --git a/README.md b/README.md
index bd2bc4c..e07b3f0 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ You also need to add the following file to your GdxDefinition.gwt.xml in your ht
 ### Building from source
 To build from source, clone or download this repository, then open it in Android Studio. Perform the following command to compile and upload the library in your local repository:
 
-    gradlew clean uploadArchives -PLOCAL=true
+    gradlew clean publishToMavenLocal
     
 See `build.gradle` file for current version to use in your dependencies.
 
diff --git a/androidpublish.gradle b/androidpublish.gradle
deleted file mode 100644
index 0a2ae00..0000000
--- a/androidpublish.gradle
+++ /dev/null
@@ -1,90 +0,0 @@
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            if (isLocalBuild()) {
-                repository(url: getLocalRepositoryUrl())
-            } else if (isReleaseBuild()) {
-                repository(url: getReleaseRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
-            } else {
-                snapshotRepository(url: getSnapshotRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
-            }
-
-
-
-
-            pom.project {
-                name 'gdx-controllers'
-                description 'Game Controller Extension for libGDX'
-                url 'https://github.com/libgdx/gdx-controllers'
-
-                scm {
-                    url 'scm:git@github.com:libgdx/gdx-controllers.git'
-                    connection 'scm:git@github.com:libgdx/gdx-controllers.git'
-                    developerConnection 'scm:git@github.com:libgdx/gdx-controllers.git'
-                }
-
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        distribution 'repo'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id 'MrStahlfelge'
-                        name 'Benjamin Schulte'
-                        email 'lightblocks@golfgl.de'
-                    }
-                }
-            }
-        }
-    }
-}
-
-signing {
-    if (isReleaseBuild()) {
-        useGpgCmd()
-    }
-    required { isReleaseBuild() }
-    sign configurations.archives
-}
-
-
-task androidJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    // JDK 1.8 is more strict then 1.7. Have JDK 1.8 behave like 1.7 for javadoc generation
-    if (org.gradle.internal.jvm.Jvm.current().getJavaVersion() == JavaVersion.VERSION_1_8) {
-        options.addStringOption('Xdoclint:none', '-quiet')
-    }
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    classifier = 'javadoc'
-    from androidJavadocs.destinationDir
-}
-
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-artifacts {
-    archives androidSourcesJar
-    archives androidJavadocsJar
-}
-
-afterEvaluate {
-    androidJavadocs.classpath += project.android.libraryVariants.toList().first().javaCompile.classpath
-}
diff --git a/build.gradle b/build.gradle
index bdc3359..c13359f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,8 @@ buildscript {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-        classpath "org.wisepersist:gwt-gradle-plugin:1.0.13"
-        classpath "com.android.tools.build:gradle:4.1.3"
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.19'
+        classpath "org.docstr:gwt-gradle-plugin:1.1.29"
+        classpath "com.android.tools.build:gradle:7.2.2"
     }
 }
 
@@ -27,15 +26,6 @@ allprojects {
             return project.hasProperty("RELEASE")
         }
 
-        isLocalBuild = {
-            return project.hasProperty("LOCAL")
-        }
-
-        getLocalRepositoryUrl = {
-            return project.hasProperty('LOCAL_REPOSITORY_URL') ? LOCAL_REPOSITORY_URL
-                    : 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath
-        }
-
         getReleaseRepositoryUrl = {
             return project.hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
                     : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@@ -73,9 +63,20 @@ allprojects {
     tasks.withType(Test) {
         systemProperty 'file.encoding', 'UTF-8'
     }
+}
 
-    tasks.withType(Sign) {
-        onlyIf { isReleaseBuild() }
+configure(subprojects.findAll {!it.path.contains(":test:") && it.name != 'gdx-controllers-android'}) {
+    apply plugin: 'java-library'
+
+    java {
+        withSourcesJar()
+        withJavadocJar()
     }
 }
 
+apply from: rootProject.file('publish.gradle')
+
+if(rootProject.file('override.gradle').exists())
+    apply from: rootProject.file('override.gradle')
+
+
diff --git a/gdx-controllers-android/build.gradle b/gdx-controllers-android/build.gradle
index afd0a61..79fedae 100644
--- a/gdx-controllers-android/build.gradle
+++ b/gdx-controllers-android/build.gradle
@@ -5,7 +5,6 @@ project.group = 'com.badlogicgames.gdx-controllers'
 android {
 
     compileSdkVersion 29
-    buildToolsVersion '29.0.3'
 
     defaultConfig {
         minSdkVersion 16
@@ -29,6 +28,13 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
@@ -38,6 +44,4 @@ dependencies {
 
 ext {
     ARTIFACTID = 'gdx-controllers-android'
-}
-
-apply from : '../androidpublish.gradle'
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/gdx-controllers-core/build.gradle b/gdx-controllers-core/build.gradle
index 7ff64dc..c439403 100644
--- a/gdx-controllers-core/build.gradle
+++ b/gdx-controllers-core/build.gradle
@@ -1,12 +1,3 @@
-apply plugin: 'java-library'
-
-apply from: '../publish.gradle'
-
-configurations {
-	custom
-	compile.extendsFrom custom
-}
-
 eclipse {
 	project {
 		name = appName + "-core"
@@ -17,8 +8,6 @@ dependencies {
 	implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
 }
 
-sourceSets.main.java.srcDirs = [ "src/" ]
-
 targetCompatibility = 1.7
 sourceCompatibility = 1.7
 
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/AbstractController.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/AbstractController.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/AbstractController.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/AbstractController.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/AbstractControllerManager.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/AbstractControllerManager.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/AbstractControllerManager.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/AbstractControllerManager.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/Controller.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/Controller.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/Controller.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/Controller.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerAdapter.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerAdapter.java
similarity index 97%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerAdapter.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerAdapter.java
index d3f2153..2c0a7fa 100644
--- a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerAdapter.java
+++ b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerAdapter.java
@@ -1,44 +1,44 @@
-/*******************************************************************************
- * Copyright 2011 See AUTHORS file.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-package com.badlogic.gdx.controllers;
-
-/** A base implementation for {@link ControllerListener}. Subclass this if you are only interested in a few specific events.
- * @author mzechner */
-public class ControllerAdapter implements ControllerListener {
-	@Override
-	public boolean buttonDown (Controller controller, int buttonIndex) {
-		return false;
-	}
-
-	@Override
-	public boolean buttonUp (Controller controller, int buttonIndex) {
-		return false;
-	}
-
-	@Override
-	public boolean axisMoved (Controller controller, int axisIndex, float value) {
-		return false;
-	}
-
-	@Override
-	public void connected (Controller controller) {
-	}
-
-	@Override
-	public void disconnected (Controller controller) {
-	}
-}
+/*******************************************************************************
+ * Copyright 2011 See AUTHORS file.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package com.badlogic.gdx.controllers;
+
+/** A base implementation for {@link ControllerListener}. Subclass this if you are only interested in a few specific events.
+ * @author mzechner */
+public class ControllerAdapter implements ControllerListener {
+	@Override
+	public boolean buttonDown (Controller controller, int buttonIndex) {
+		return false;
+	}
+
+	@Override
+	public boolean buttonUp (Controller controller, int buttonIndex) {
+		return false;
+	}
+
+	@Override
+	public boolean axisMoved (Controller controller, int axisIndex, float value) {
+		return false;
+	}
+
+	@Override
+	public void connected (Controller controller) {
+	}
+
+	@Override
+	public void disconnected (Controller controller) {
+	}
+}
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerListener.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerListener.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerListener.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerListener.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerManager.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerManager.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerManager.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerManager.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerManagerStub.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerManagerStub.java
similarity index 97%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerManagerStub.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerManagerStub.java
index eff71cd..245f46d 100644
--- a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerManagerStub.java
+++ b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerManagerStub.java
@@ -1,40 +1,40 @@
-/*******************************************************************************
- * Copyright 2011 See AUTHORS file.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-package com.badlogic.gdx.controllers;
-
-import com.badlogic.gdx.utils.Array;
-
-/** Used on platforms that don't support the extenions, e.g. HTML5 and iOS.
- * @author mzechner */
-public class ControllerManagerStub extends AbstractControllerManager {
-
-	@Override
-	public void addListener (ControllerListener listener) {
-	}
-
-	@Override
-	public void removeListener (ControllerListener listener) {
-	}
-
-	@Override
-	public void clearListeners () {
-	}
-	
-	public Array<ControllerListener> getListeners() {
-		return new Array<ControllerListener>();
-	}
-}
+/*******************************************************************************
+ * Copyright 2011 See AUTHORS file.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package com.badlogic.gdx.controllers;
+
+import com.badlogic.gdx.utils.Array;
+
+/** Used on platforms that don't support the extenions, e.g. HTML5 and iOS.
+ * @author mzechner */
+public class ControllerManagerStub extends AbstractControllerManager {
+
+	@Override
+	public void addListener (ControllerListener listener) {
+	}
+
+	@Override
+	public void removeListener (ControllerListener listener) {
+	}
+
+	@Override
+	public void clearListeners () {
+	}
+	
+	public Array<ControllerListener> getListeners() {
+		return new Array<ControllerListener>();
+	}
+}
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerMapping.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerMapping.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerMapping.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerMapping.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerPowerLevel.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerPowerLevel.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerPowerLevel.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/ControllerPowerLevel.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers/Controllers.java b/gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/Controllers.java
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers/Controllers.java
rename to gdx-controllers-core/src/main/java/com/badlogic/gdx/controllers/Controllers.java
diff --git a/gdx-controllers-core/src/com/badlogic/gdx/controllers.gwt.xml b/gdx-controllers-core/src/main/resources/com/badlogic/gdx/controllers.gwt.xml
similarity index 100%
rename from gdx-controllers-core/src/com/badlogic/gdx/controllers.gwt.xml
rename to gdx-controllers-core/src/main/resources/com/badlogic/gdx/controllers.gwt.xml
diff --git a/gdx-controllers-desktop/build.gradle b/gdx-controllers-desktop/build.gradle
index 33cb6f1..2665e1f 100644
--- a/gdx-controllers-desktop/build.gradle
+++ b/gdx-controllers-desktop/build.gradle
@@ -1,12 +1,3 @@
-apply plugin: 'java-library'
-
-apply from: '../publish.gradle'
-
-configurations {
-	custom
-	compile.extendsFrom custom
-}
-
 eclipse {
 	project {
 		name = appName + "-desktop"
diff --git a/gdx-controllers-gwt/build.gradle b/gdx-controllers-gwt/build.gradle
index fb46936..cdaa85c 100644
--- a/gdx-controllers-gwt/build.gradle
+++ b/gdx-controllers-gwt/build.gradle
@@ -1,13 +1,3 @@
-apply plugin: 'java-library'
-
-
-apply from: '../publish.gradle'
-
-configurations {
-    custom
-    compile.extendsFrom custom
-}
-
 eclipse {
     project {
         name = appName + "-gwt-controllers"
@@ -21,8 +11,6 @@ dependencies {
     implementation "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
 }
 
-sourceSets.main.java.srcDirs = [ "src/" ]
-
 targetCompatibility = 1.7
 sourceCompatibility = 1.7
 
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/GwtController.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/GwtController.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/GwtController.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/GwtController.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/GwtControllerEvent.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/GwtControllerEvent.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/GwtControllerEvent.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/GwtControllerEvent.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/GwtControllers.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/GwtControllers.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/GwtControllers.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/GwtControllers.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/WebMapping.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/WebMapping.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/WebMapping.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/WebMapping.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/Gamepad.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/Gamepad.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/Gamepad.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/Gamepad.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/GamepadButton.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/GamepadButton.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/GamepadButton.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/GamepadButton.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/GamepadSupport.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/GamepadSupport.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/GamepadSupport.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/GamepadSupport.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/GamepadSupportListener.java b/gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/GamepadSupportListener.java
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/gwt/support/GamepadSupportListener.java
rename to gdx-controllers-gwt/src/main/java/com/badlogic/gdx/controllers/gwt/support/GamepadSupportListener.java
diff --git a/gdx-controllers-gwt/src/com/badlogic/gdx/controllers/controllers-gwt.gwt.xml b/gdx-controllers-gwt/src/main/resources/com/badlogic/gdx/controllers/controllers-gwt.gwt.xml
similarity index 100%
rename from gdx-controllers-gwt/src/com/badlogic/gdx/controllers/controllers-gwt.gwt.xml
rename to gdx-controllers-gwt/src/main/resources/com/badlogic/gdx/controllers/controllers-gwt.gwt.xml
diff --git a/gdx-controllers-ios/build.gradle b/gdx-controllers-ios/build.gradle
index a0f3103..1d09234 100644
--- a/gdx-controllers-ios/build.gradle
+++ b/gdx-controllers-ios/build.gradle
@@ -1,13 +1,14 @@
-apply plugin: 'java-library'
-apply plugin: 'robovm'
-
-apply from: '../publish.gradle'
-
-configurations {
-	custom
-	compile.extendsFrom custom
+buildscript {
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.19'
+	}
 }
 
+apply plugin: 'robovm'
+
 eclipse {
 	project {
 		name = appName + "-ios"
@@ -19,7 +20,6 @@ dependencies {
 	implementation "com.mobidevelop.robovm:robovm-rt:${roboVMVersion}"
 	implementation "com.mobidevelop.robovm:robovm-cocoatouch:${roboVMVersion}"
 	implementation "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
-
 }
 
 targetCompatibility = 1.7
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961f..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 71e5d5d..2e6e589 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Sep 07 22:26:25 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f955316..107acd3 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/publish.gradle b/publish.gradle
index bd1a436..e0f03c0 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -1,91 +1,82 @@
-apply plugin: 'maven'
-apply plugin: 'signing'
+configure([
+        project(":gdx-controllers-core"),
+        project(":gdx-controllers-android"),
+        project(":gdx-controllers-desktop"),
+        project(":gdx-controllers-gwt"),
+        project(":gdx-controllers-ios")
+])
+{
+    apply plugin: 'maven-publish'
+    apply plugin: 'signing'
 
-afterEvaluate { project ->
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+    afterEvaluate { project ->
+        //Workaround android not having components populated yet.
+        afterEvaluate {
+            publishing {
+                publications {
+                    mavenJava(MavenPublication) {
 
-                if (isLocalBuild()) {
-                    repository(url: getLocalRepositoryUrl())
-                } else if (isReleaseBuild()) {
-                    repository(url: getReleaseRepositoryUrl()) {
-                        authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                    }
-                } else {
-                    snapshotRepository(url: getSnapshotRepositoryUrl()) {
-                        authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                    }
-                }
-
-
-
-
-                pom.project {
-                    name 'gdx-controllers'
-                    description 'Game Controller Extension for libGDX'
-                    url 'https://github.com/libgdx/gdx-controllers'
+                        //Most normal java projects
+                        if (components.findByName("java") != null)
+                            from components.java
 
-                    scm {
-                        url 'scm:git@github.com:libgdx/gdx-controllers.git'
-                        connection 'scm:git@github.com:libgdx/gdx-controllers.git'
-                        developerConnection 'scm:git@github.com:libgdx/gdx-controllers.git'
-                    }
+                        //Android
+                        if (components.findByName("release") != null) {
+                            from components.release
+                        }
 
-                    licenses {
-                        license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                            distribution 'repo'
+                        pom {
+                            name = POM_NAME
+                            if (!POM_DESCRIPTION.isEmpty())
+                                description = POM_DESCRIPTION
+                            url = POM_URL
+                            licenses {
+                                license {
+                                    name = POM_LICENCE_NAME
+                                    url = POM_LICENCE_URL
+                                    distribution = POM_LICENCE_DIST
+                                }
+                            }
+                            developers {
+                                developer {
+                                    id = "libGDX Developers"
+                                    url = "https://github.com/libgdx/libgdx/graphs/contributors"
+                                }
+                            }
+                            scm {
+                                connection = POM_SCM_CONNECTION
+                                developerConnection = POM_SCM_DEV_CONNECTION
+                                url = POM_SCM_URL
+                            }
                         }
                     }
+                }
 
-                    developers {
-                        developer {
-                            id = "Tomski"
-                            name = "Tom Wojciechowski"
-                            email = "tomwojciechowski@asidik.com"
-                        }
-                        developer {
-                            id 'MrStahlfelge'
-                            name 'Benjamin Schulte'
-                            email 'lightblocks@golfgl.de'
+                repositories {
+                    maven {
+                        url = version.endsWith('SNAPSHOT') ? getSnapshotRepositoryUrl() : getReleaseRepositoryUrl()
+
+                        if (getRepositoryUsername() || getRepositoryPassword()) {
+                            credentials {
+                                username = getRepositoryUsername()
+                                password = getRepositoryPassword()
+                            }
                         }
                     }
                 }
             }
-        }
-    }
 
-    signing {
-        if (isReleaseBuild()) {
-            useGpgCmd()
-        }
-        required { isReleaseBuild() }
-        sign configurations.archives
-    }
-
-    task libraryJar(type: Jar, dependsOn:classes) {
-        from sourceSets.main.output.classesDirs
-        from configurations.custom.collect { it.isDirectory() ? it : zipTree(it) }
-        classifier = 'library'
-    }
-
-    task sourcesJar(type: Jar, dependsOn:classes) {
-        from sourceSets.main.allSource
-        classifier = 'sources'
-    }
-
-    task javadocJar(type: Jar, dependsOn:javadoc) {
-        from javadoc.destinationDir
-        classifier = 'javadoc'
-    }
+            signing {
+                useGpgCmd()
+                sign publishing.publications.mavenJava
+            }
 
-    artifacts {
-        archives libraryJar
-        archives sourcesJar
-        archives javadocJar
+            //Simply using "required" in signing block doesn't work because taskGraph isn't ready yet.
+            gradle.taskGraph.whenReady {
+                tasks.withType(Sign) {
+                    onlyIf { isReleaseBuild() }
+                }
+            }
+        }
     }
-
 }
diff --git a/test/desktop/build.gradle b/test/desktop/build.gradle
index 45f9861..4eb551d 100644
--- a/test/desktop/build.gradle
+++ b/test/desktop/build.gradle
@@ -19,6 +19,7 @@ jar {
 	manifest {
 		attributes 'Main-Class': project.mainClassName
 	}
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 run {
diff --git a/test/html/build.gradle b/test/html/build.gradle
index 3fdbb6b..32c0a9a 100644
--- a/test/html/build.gradle
+++ b/test/html/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		maven { url "https://plugins.gradle.org/m2/" }
 	}
 	dependencies {
-		classpath 'org.gretty:gretty:3.0.2'
+		classpath 'org.gretty:gretty:3.1.0'
 	}
 }
 apply plugin: "gwt"
@@ -35,7 +35,7 @@ dependencies {
 }
 
 import org.akhikhl.gretty.AppBeforeIntegrationTestTask
-import org.wisepersist.gradle.plugins.gwt.GwtSuperDev
+import org.docstr.gradle.plugins.gwt.GwtSuperDev
 
 gretty.httpPort = 8080
 gretty.resourceBase = project.buildDir.path + "/gwt/draftOut"
@@ -71,6 +71,7 @@ task superDev(type: GwtSuperDev) {
 		gwt.modules = gwt.devModules
 	}
 }
+
 task dist(dependsOn: [clean, compileGwt]) {
     doLast {
 		file("build/dist").mkdirs()
@@ -91,10 +92,9 @@ task dist(dependsOn: [clean, compileGwt]) {
 
 task addSource {
 	doLast {
-		sourceSets.main.compileClasspath += files(project(':gdx-controllers-core').sourceSets.main.allJava.srcDirs)
-		sourceSets.main.compileClasspath += files(project(':gdx-controllers-gwt').sourceSets.main.allJava.srcDirs)
-		sourceSets.main.compileClasspath += files(project(':test:core').sourceSets.main.allJava.srcDirs)
-
+		sourceSets.main.compileClasspath += files(project(':gdx-controllers-core').sourceSets.main.allSource.srcDirs)
+		sourceSets.main.compileClasspath += files(project(':gdx-controllers-gwt').sourceSets.main.allSource.srcDirs)
+		sourceSets.main.compileClasspath += files(project(':test:core').sourceSets.main.allSource.srcDirs)
 	}
 }
 
diff --git a/test/ios/build.gradle b/test/ios/build.gradle
index 028d25a..d2252ff 100644
--- a/test/ios/build.gradle
+++ b/test/ios/build.gradle
@@ -1,3 +1,12 @@
+buildscript {
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.19'
+	}
+}
+
 apply plugin: 'robovm'
 apply plugin: 'java'
 
diff --git a/test/lwjgl3/build.gradle b/test/lwjgl3/build.gradle
index fd55b24..9a47772 100644
--- a/test/lwjgl3/build.gradle
+++ b/test/lwjgl3/build.gradle
@@ -36,4 +36,5 @@ jar {
 	manifest {
 		attributes 'Main-Class': project.mainClassName
 	}
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }