Update from upstream

.github/dependabot.yml

@@ -1,9 +1,15 @@
 version: 2
+registries:
+  maven-central:
+    type: maven-repository
+    url: "https://repo.maven.apache.org/maven2/"
 updates:
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "daily"
+    registries:
+      - maven-central
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/build.yml

@@ -3,11 +3,13 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 21

.gitignore

@@ -12,5 +12,7 @@ hs_err_pid*
 /.idea/*
 !/.idea/copyright/
 /.gradle/
-/build/
-/out/
+/buildSrc/.gradle/
+build/
+out/
+/run/

build.gradle

@@ -1,97 +1,25 @@
 plugins {
     id "java-library"
-    id "maven-publish"
-    id "signing"
-    id "net.raphimc.class-token-replacer" version "1.1.3"
+    id "base.base-conventions"
+    id "base.fill-build-constants"
+    id "minecraftauth.publishing-conventions"
+    id "net.raphimc.class-token-replacer" version "1.1.6"
 }
 
-base {
-    java.toolchain.languageVersion = JavaLanguageVersion.of(8)
-    compileJava.options.encoding = compileTestJava.options.encoding = javadoc.options.encoding = "UTF-8"
-
-    group = project.maven_group ?: rootProject.maven_group
-    archivesName = project.maven_name ?: rootProject.maven_name
-    version = project.maven_version ?: rootProject.maven_version
-}
-
-repositories {
-    mavenCentral()
+sourceSets {
+    javaFxStub // Java 11+ does not include JavaFX anymore, so the JavaFX stubs are needed for the compiler
 }
 
 dependencies {
-    compileOnly(annotationProcessor("org.projectlombok:lombok:1.18.34"))
-    compileOnly "org.jetbrains:annotations:24.1.0"
+    compileOnly(annotationProcessor("org.projectlombok:lombok:1.18.38"))
+    compileOnly "org.jetbrains:annotations:26.0.2"
+    compileOnly sourceSets.javaFxStub.output
 
-    api "com.google.code.gson:gson:2.11.0"
+    api "net.lenni0451.commons:httpclient:1.7.1"
+    api "com.google.code.gson:gson:2.13.1"
     api "io.jsonwebtoken:jjwt-impl:0.12.6"
     api("io.jsonwebtoken:jjwt-gson:0.12.6") {
         exclude group: "com.google.code.gson", module: "gson"
     }
-}
-
-sourceSets {
-    main {
-        classTokenReplacer {
-            property("\${version}", project.version)
-            property("\${impl_version}", "git-${project.name}-${project.version}:${project.latestCommitHash()}")
-        }
-    }
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-jar {
-    from("LICENSE") {
-        rename { "${it}_${project.name ?: rootProject.name}" }
-    }
-}
-
-artifacts {
-    archives javadocJar, sourcesJar
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            groupId = project.maven_group
-            artifactId = project.maven_name
-            version = project.maven_version
-
-            from components.java
-
-            pom {
-                name = "MinecraftAuth"
-                description = "Simple and easy to use Minecraft microsoft authentication library (Java and Bedrock)"
-                url = "https://github.com/RaphiMC/MinecraftAuth"
-                licenses {
-                    license {
-                        name = "LGPL-3.0 License"
-                        url = "https://github.com/RaphiMC/MinecraftAuth/blob/main/LICENSE"
-                    }
-                }
-                developers {
-                    developer {
-                        id = "RK_01"
-                    }
-                }
-                scm {
-                    connection = "scm:git:git://github.com/RaphiMC/MinecraftAuth.git"
-                    developerConnection = "scm:git:ssh://github.com/RaphiMC/MinecraftAuth.git"
-                    url = "https://github.com/RaphiMC/MinecraftAuth.git"
-                }
-            }
-        }
-    }
-}
-
-String latestCommitHash() {
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine "git", "rev-parse", "--short", "HEAD"
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
+    api "org.slf4j:slf4j-api:2.0.17"
 }

buildSrc/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id "groovy-gradle-plugin"
+}
+
+repositories {
+    gradlePluginPortal()
+}

buildSrc/src/main/groovy/base.base-conventions.gradle

@@ -0,0 +1,34 @@
+base {
+    java.toolchain.languageVersion = JavaLanguageVersion.of(project.java_version)
+
+    group = project.maven_group
+    archivesName = project.name
+    version = project.maven_version
+}
+
+repositories {
+    mavenCentral()
+}
+
+jar {
+    if (layout.projectDirectory.file("LICENSE").asFile.exists()) {
+        def projectName = project.name
+        from(layout.projectDirectory.file("LICENSE")) {
+            rename { "${it}_${projectName}" }
+        }
+    } else if (rootProject.layout.projectDirectory.file("LICENSE").asFile.exists()) {
+        def projectName = rootProject.name
+        from(rootProject.layout.projectDirectory.file("LICENSE")) {
+            rename { "${it}_${projectName}" }
+        }
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.encoding = "UTF-8"
+}
+
+tasks.withType(Javadoc).configureEach {
+    it.options.encoding = "UTF-8"
+    it.options.addStringOption("Xdoclint:none", "-quiet")
+}

buildSrc/src/main/groovy/base.fill-build-constants.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id "net.raphimc.class-token-replacer"
+}
+
+sourceSets.configureEach {
+    it.classTokenReplacer {
+        property("\${version}", project.version)
+        property("\${commit_hash}", latestCommitHash().get())
+    }
+}
+
+Provider<String> latestCommitHash() {
+    return providers.exec {
+        commandLine = ["git", "rev-parse", "--short", "HEAD"]
+    }.standardOutput.getAsText().map(String::trim)
+}

buildSrc/src/main/groovy/base.lenni0451-maven-publishing.gradle

@@ -0,0 +1,13 @@
+publishing {
+    repositories {
+        maven {
+            name = "reposilite"
+            url = "https://maven.lenni0451.net/" + (project.maven_version.endsWith("SNAPSHOT") ? "snapshots" : "releases")
+
+            credentials(PasswordCredentials)
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/base.maven-central-publishing.gradle

@@ -0,0 +1,13 @@
+publishing {
+    repositories {
+        maven {
+            name = "ossrh"
+            url = "https://s01.oss.sonatype.org/" + (project.maven_version.endsWith("SNAPSHOT") ? "content/repositories/snapshots/" : "service/local/staging/deploy/maven2/")
+
+            credentials(PasswordCredentials)
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
+    }
+}

buildSrc/src/main/groovy/base.publishing-conventions.gradle

@@ -0,0 +1,30 @@
+plugins {
+    id "maven-publish"
+    id "signing"
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from(components.java)
+
+            groupId = project.maven_group
+            artifactId = project.maven_name
+            version = project.maven_version
+        }
+    }
+}
+
+signing {
+    setRequired(false)
+    sign(publishing.publications.mavenJava)
+}
+
+tasks.withType(PublishToMavenRepository).configureEach {
+    it.dependsOn(tasks.withType(Sign))
+}

buildSrc/src/main/groovy/minecraftauth.publishing-conventions.gradle

@@ -0,0 +1,33 @@
+plugins {
+    id "base.publishing-conventions"
+    id "base.maven-central-publishing"
+    id "base.lenni0451-maven-publishing"
+}
+
+publishing {
+    publications {
+        mavenJava {
+            pom {
+                name = "MinecraftAuthHeadless"
+                description = "Simple and easy to use Minecraft microsoft authentication library (Java and Bedrock)"
+                url = "https://github.com/mcio-dev/MinecraftAuthHeadless"
+                licenses {
+                    license {
+                        name = "LGPL-3.0 License"
+                        url = "https://github.com/mcio-dev/MinecraftAuthHeadless/blob/main/LICENSE"
+                    }
+                }
+                developers {
+                    developer {
+                        id = "RK_01"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git://github.com/mcio-dev/MinecraftAuthHeadless.git"
+                    developerConnection = "scm:git:ssh://github.com/mcio-dev/MinecraftAuthHeadless.git"
+                    url = "https://github.com/mcio-dev/MinecraftAuthHeadless.git"
+                }
+            }
+        }
+    }
+}

gradle.properties

@@ -1,7 +1,8 @@
 org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.configureondemand=true
+org.gradle.configuration-cache=true
 
+java_version=8
 maven_group=net.raphimc
 maven_name=MinecraftAuthHeadless
-maven_version=4.1.1-SNAPSHOT
+maven_version=4.1.2-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.