Update Gradle, update to libGDX 1.13.1

kotcrab · kotcrab · commit 1beb22e8285d · 2025-01-29T21:35:15.000+01:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1 @@
-/.github/workflows/ @kotcrab
-/.github/CODEOWNERS @kotcrab
+* @kotcrab
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,19 +20,14 @@ jobs:
       - name: Run tests
         run: ./gradlew check
       - name: Upload to Maven Central
-        run: ./gradlew :ui:uploadArchives
+        run: ./gradlew :ui:publishToSonatype
         env:
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ossrhUsername }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ossrhPassword }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.signingKey }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.signingPassword }}
-      - name: Close repository
-        run: ./gradlew closeRepository
-        env:
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ossrhUsername }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ossrhPassword }}
-      - name: Release repository
-        run: ./gradlew releaseRepository
+      - name: Close and release repository
+        run: ./gradlew closeAndReleaseSonatypeStagingRepository
         env:
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ossrhUsername }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ossrhPassword }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Run tests
         run: ./gradlew check
       - name: Upload to Maven Central
-        run: ./gradlew :ui:uploadArchives
+        run: ./gradlew :ui:publishToSonatype
         env:
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ossrhUsername }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ossrhPassword }}
diff --git a/AUTHORS b/AUTHORS
@@ -7,4 +7,4 @@
 #	Name or Organization <email address>
 # The email address is not required for organizations.
 
-Pawel Pastuszak <contact(a)kotcrab.com>
+Kotcrab <contact(a)kotcrab.com>
diff --git a/build.gradle b/build.gradle
@@ -6,17 +6,15 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3"
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0"
         classpath "com.kotcrab.vis:vis-usl:0.2.1"
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.2"
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
     }
 }
 
-apply plugin: "distribution"
-apply plugin: "io.codearte.nexus-staging"
-apply plugin: "com.github.ben-manes.versions"
+plugins {
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
+    id("com.github.ben-manes.versions") version "0.52.0"
+}
 
 allprojects {
     apply plugin: "eclipse"
@@ -25,7 +23,7 @@ allprojects {
 
     ext {
         appName = 'vis'
-        gdxVersion = '1.12.1'
+        gdxVersion = '1.13.1'
         jnaVersion = '4.1.0'
         jnaPlatformVersion = '3.5.2'
         junitVersion = '4.13.2'
@@ -39,10 +37,17 @@ allprojects {
     }
 }
 
-nexusStaging {
+nexusPublishing {
     packageGroup = "com.kotcrab"
-    username = ossrhUsername
-    password = ossrhPassword
+    repositories {
+        sonatype {
+            username = ossrhUsername
+            password = ossrhPassword
+        }
+    }
+    useStaging.set(provider {
+        project.version.endsWith("-SNAPSHOT")
+    })
 }
 
 tasks.eclipse.doLast {
diff --git a/deploy.gradle b/deploy.gradle
@@ -1,75 +1,59 @@
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
-task javadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    archives javadocJar, sourcesJar
+java {
+    withJavadocJar()
+    withSourcesJar()
 }
 
 javadoc {
     def generateJavadoc = project.hasProperty("generateJavadoc")
-    onlyIf { (isReleaseVersion || gradle.taskGraph.hasTask("uploadArchives")) || generateJavadoc }
+    onlyIf { (isReleaseVersion || gradle.taskGraph.hasTask(":ui:publishToSonatype")) || generateJavadoc }
 
     options.encoding = 'UTF-8'
     options.addStringOption('Xdoclint:none', '-quiet')
 }
 
-signing {
-    required { isReleaseVersion || gradle.taskGraph.hasTask("uploadArchives") }
-    def signingKey = findProperty("signingKey")
-    def signingPassword = findProperty("signingPassword")
-    useInMemoryPgpKeys(signingKey, signingPassword)
-    sign configurations.archives
-}
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
-            }
-
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
-            }
-
-            pom.project {
-                url 'https://github.com/kotcrab/vis-ui/'
+            pom {
+                url = 'https://github.com/kotcrab/vis-ui/'
 
                 scm {
-                    connection 'scm:git:git@github.com:kotcrab/vis-ui.git'
-                    developerConnection 'scm:git:git@github.com:kotcrab/vis-ui.git'
-                    url 'git@github.com:kotcrab/vis-ui.git'
+                    connection = 'scm:git:git@github.com:kotcrab/vis-ui.git'
+                    developerConnection = 'scm:git:git@github.com:kotcrab/vis-ui.git'
+                    url = 'git@github.com:kotcrab/vis-ui.git'
                 }
 
                 licenses {
                     license {
-                        name 'The Apache License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
 
                 developers {
                     developer {
-                        id 'kotcrab'
-                        name 'Pawel Pastuszak'
-                        url 'https://kotcrab.com'
+                        id = 'kotcrab'
+                        name = 'Kotcrab'
+                        url = 'https://kotcrab.com'
                     }
                 }
+
             }
         }
     }
 }
+
+signing {
+    required { isReleaseVersion || gradle.taskGraph.hasTask(":ui:publishToSonatype") }
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign publishing.publications.maven
+}
diff --git a/ui/CHANGES.md b/ui/CHANGES.md
@@ -1,3 +1,6 @@
+#### Version: 1.5.5 (libGDX 1.13.1)
+- Updated to libGDX 1.13.1
+
 #### Version: 1.5.4-SNAPSHOT (libGDX 1.12.1)
 - **Changed**: [#393](https://github.com/kotcrab/vis-ui/pull/393) - Removed use of Apple Java extensions in `FileUtils`
 
diff --git a/ui/build.gradle b/ui/build.gradle
@@ -1,23 +1,23 @@
 group = 'com.kotcrab.vis'
-version = '1.5.4'
+version = '1.5.5-SNAPSHOT'
 
 apply plugin: "java"
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply from: '../deploy.gradle'
 
 archivesBaseName = "vis-ui"
 sourceCompatibility = 1.7
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 dependencies {
-    compile "com.badlogicgames.gdx:gdx:$gdxVersion"
-    testCompile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
-    testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-    testCompile "junit:junit:$junitVersion"
-    //testCompile "com.kotcrab.vne:vne-runtime:1.0.1"
-    //testCompile "com.kotcrab.vne:vne-win-thumbnails:1.0.1"
-    //testCompile group: 'com.kotcrab.vis', name: 'vis-ui-contrib', version: '1.3.0'
-    //testCompile "org.imgscalr:imgscalr-lib:4.2"
+    implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
+    testImplementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
+    testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+    testImplementation "junit:junit:$junitVersion"
+    //testImplementation "com.kotcrab.vne:vne-runtime:1.0.1"
+    //testImplementation "com.kotcrab.vne:vne-win-thumbnails:1.0.1"
+    //testImplementation group: 'com.kotcrab.vis', name: 'vis-ui-contrib', version: '1.3.0'
+    //testImplementation "org.imgscalr:imgscalr-lib:4.2"
 }
 
 compileTestJava {
@@ -35,14 +35,14 @@ eclipse.project {
     name = appName + "-ui"
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name 'vis-ui'
-                artifactId 'vis-ui'
-                packaging 'jar'
-                description 'UI toolkit and flat design skin for scene2d.ui'
+publishing {
+    publications {
+        maven(MavenPublication) {
+            pom {
+                name = 'vis-ui'
+                artifactId = 'vis-ui'
+                packaging = 'jar'
+                description = 'UI toolkit and flat design skin for scene2d.ui'
             }
         }
     }
diff --git a/ui/src/main/java/com/kotcrab/vis/ui/VisUI.java b/ui/src/main/java/com/kotcrab/vis/ui/VisUI.java
@@ -30,7 +30,7 @@
  * @author Kotcrab
  */
 public class VisUI {
-	private static final String TARGET_GDX_VERSION = "1.12.1";
+	private static final String TARGET_GDX_VERSION = "1.13.1";
 	private static boolean skipGdxVersionCheck = false;
 
 	private static int defaultTitleAlign = Align.left;
diff --git a/usl/build.gradle b/usl/build.gradle
@@ -2,29 +2,29 @@ group = 'com.kotcrab.vis'
 version = '0.2.2-SNAPSHOT'
 
 apply plugin: "java"
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply from: '../deploy.gradle'
 
 archivesBaseName = "vis-usl"
 sourceCompatibility = 1.7
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 dependencies {
-    testCompile "junit:junit:$junitVersion"
+    testImplementation "junit:junit:$junitVersion"
 }
 
 eclipse.project {
     name = appName + "-usl"
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name 'vis-usl'
-                artifactId 'vis-usl'
-                packaging 'jar'
-                description 'UI styling language for scene2d.ui'
+publishing {
+    publications {
+        maven(MavenPublication) {
+            pom {
+                name = 'vis-usl'
+                artifactId = 'vis-usl'
+                packaging = 'jar'
+                description = 'UI styling language for scene2d.ui'
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-/.github/workflows/ @kotcrab`
`2`		`-/.github/CODEOWNERS @kotcrab`
	`1`	`+* @kotcrab`