Merge pull request #926 from KyoriPowered/chore/indra-update

chore(build): Update indra and gradle, plus other build deps
KyoriPowered · May 14, 2023 · 66ef0e7 · 66ef0e7
2 parents 75900f7 + 70a6bed
commit 66ef0e7
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 33 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 configurations {
   testCompileOnly {
-    extendsFrom(compileOnlyApi.forUseAtConfigurationTime().get())
+    extendsFrom(compileOnlyApi.get())
   }
 }
 

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -18,15 +18,15 @@ dependencies {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
 }
 
 kotlin {
   target {
     compilations.configureEach {
       kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
       }
     }
   }

diff --git a/build-logic/src/main/kotlin/adventure.base-conventions.gradle.kts b/build-logic/src/main/kotlin/adventure.base-conventions.gradle.kts
@@ -19,46 +19,47 @@ indra {
   }
   mitLicense()
 
+  signWithKeyFromPrefixedProperties("kyori")
   configurePublications {
     pom {
       developers {
         developer {
-          id.set("kashike")
-          timezone.set("America/Vancouver")
+          id = "kashike"
+          timezone = "America/Vancouver"
         }
 
         developer {
-          id.set("lucko")
-          name.set("Luck")
-          url.set("https://lucko.me")
-          email.set("[email protected]")
+          id = "lucko"
+          name = "Luck"
+          url = "https://lucko.me"
+          email = "[email protected]"
         }
 
         developer {
-          id.set("zml")
-          name.set("zml")
-          timezone.set("America/Vancouver")
+          id = "zml"
+          name = "zml"
+          timezone = "America/Vancouver"
         }
 
         developer {
-          id.set("Electroid")
+          id = "Electroid"
         }
 
         developer {
-          id.set("minidigger")
-          name.set("MiniDigger")
+          id = "minidigger"
+          name = "MiniDigger"
         }
 
         developer {
-          id.set("kezz")
+          id = "kezz"
         }
 
         developer {
-          id.set("broccolai")
+          id = "broccolai"
         }
 
         developer {
-          id.set("rymiel")
+          id = "rymiel"
         }
       }
     }

diff --git a/build-logic/src/main/kotlin/adventure.common-conventions.gradle.kts b/build-logic/src/main/kotlin/adventure.common-conventions.gradle.kts
@@ -26,7 +26,7 @@ testlogger {
 
 plugins.withId("me.champeau.jmh") {
   extensions.configure(JmhParameters::class) {
-    jmhVersion.set(libs.versions.jmh.get())
+    jmhVersion = libs.versions.jmh.get()
   }
   tasks.named("compileJmhJava") {
     // avoid implicit task dependencies
@@ -76,7 +76,7 @@ val ADVENTURE_PREFIX = "adventure-"
 indraCrossdoc {
   baseUrl().set(providers.gradleProperty("javadocPublishRoot"))
   nameBasedDocumentationUrlProvider {
-    projectNamePrefix.set(ADVENTURE_PREFIX)
+    projectNamePrefix = ADVENTURE_PREFIX
   }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,7 @@ version=4.14.0-SNAPSHOT
 description=A user-interface library for Minecraft: Java Edition.
 
 org.gradle.parallel=true
+systemProp.org.gradle.unsafe.kotlin.assignment=true
 
 javadocPublishRoot=https://jd.advntr.dev/
 testJdks=8, 11, 17
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,15 +2,14 @@
 version = "1.0"
 
 [versions]
-checkstyle = "10.10.0"
+checkstyle = "10.11.0"
 errorprone = "2.19.1"
 examination = "1.3.0"
 guava = "31.1-jre"
-indra = "3.0.1"
+indra = "3.1.1"
 jmh = "1.36"
 jmhPlugin = "0.7.1"
 junit = "5.9.3"
-mockito = "4.5.1"
 slf4j = "2.0.1"
 truth = "1.1.3"
 
@@ -57,7 +56,7 @@ stylecheck = "ca.stellardrift:stylecheck:0.2.0"
 autoService-annotations = "com.google.auto.service:auto-service-annotations:1.0.1"
 autoService-processor = "com.google.auto.service:auto-service:1.0.1"
 
-build-errorpronePlugin = "net.ltgt.gradle:gradle-errorprone-plugin:3.0.1"
+build-errorpronePlugin = "net.ltgt.gradle:gradle-errorprone-plugin:3.1.0"
 build-indra = { module = "net.kyori:indra-common", version.ref = "indra" }
 build-indra-crossdoc = { module = "net.kyori:indra-crossdoc", version.ref = "indra" }
 build-indra-sonatype = { module = "net.kyori:indra-publishing-sonatype", version.ref = "indra" }
@@ -73,4 +72,4 @@ zJmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 [plugins]
 indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
 jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" }
-kotlin = "org.jetbrains.kotlin.jvm:1.8.20"
+kotlin = "org.jetbrains.kotlin.jvm:1.8.21"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # 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

diff --git a/key/build.gradle.kts b/key/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 configurations {
   testCompileOnly {
-    extendsFrom(compileOnlyApi.forUseAtConfigurationTime().get())
+    extendsFrom(compileOnlyApi.get())
   }
 }
 

diff --git a/readme.md b/readme.md
@@ -1,6 +1,6 @@
 # adventure
 
-![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/KyoriPowered/adventure/build.yml?branch=main/4) [![MIT License](https://img.shields.io/badge/license-MIT-blue)](license.txt) [![Maven Central](https://img.shields.io/maven-central/v/net.kyori/adventure-api?label=stable)](https://search.maven.org/search?q=g:net.kyori%20AND%20a:adventure*) ![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/net.kyori/adventure-api?label=dev&server=https%3A%2F%2Foss.sonatype.org) [![Javadoc](https://img.shields.io/badge/javadoc-all-green)](https://jd.advntr.dev/)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/KyoriPowered/adventure/build.yml?branch=main/4) [![MIT License](https://img.shields.io/badge/license-MIT-blue)](license.txt) [![Maven Central](https://img.shields.io/maven-central/v/net.kyori/adventure-api?label=stable)](https://search.maven.org/search?q=g:net.kyori%20AND%20a:adventure*) ![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/net.kyori/adventure-api?label=dev&server=https%3A%2F%2Fs01.oss.sonatype.org) [![Javadoc](https://img.shields.io/badge/javadoc-all-green)](https://jd.advntr.dev/)
 
 A serverside user interface library for *Minecraft: Java Edition*
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")