Update publishing to new gradle plugin

.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

.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 }}

.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

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.
 

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')
+
+

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'
+}

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
 

gdx-controllers-core/src/com/badlogic/gdx/controllers/ControllerAdapter.java → 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) {
+	}
+}