diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 76d246831..12589177f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v3.5.3 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v3.12.0 with: distribution: adopt java-version: '${{ matrix.java }}' diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a490e5471..953f4f532 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -9,7 +9,7 @@ repositories { dependencies { implementation("net.kyori:blossom:1.3.1") implementation("com.github.johnrengelman:shadow:8.1.1") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0") implementation("net.minecrell:plugin-yml:0.6.0") } diff --git a/buildSrc/src/main/kotlin/eternalcode-java-test.gradle.kts b/buildSrc/src/main/kotlin/eternalcode-java-test.gradle.kts index 493bebf69..1a2f39914 100644 --- a/buildSrc/src/main/kotlin/eternalcode-java-test.gradle.kts +++ b/buildSrc/src/main/kotlin/eternalcode-java-test.gradle.kts @@ -3,14 +3,14 @@ plugins { } dependencies { - testImplementation("dev.rollczi.litecommands:core:2.8.8") + testImplementation("dev.rollczi.litecommands:core:2.8.9") testImplementation("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") testImplementation("net.dzikoysk:cdn:1.14.4") testImplementation("org.panda-lang:expressible-junit:1.3.5") testImplementation("org.codehaus.groovy:groovy-all:3.0.18") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.3") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") + testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") testImplementation("org.mockito:mockito-core:5.4.0") testImplementation("net.kyori:adventure-platform-bukkit:4.3.0") testImplementation("net.kyori:adventure-platform-facet:4.3.0") diff --git a/eternalcore-core/build.gradle.kts b/eternalcore-core/build.gradle.kts index 58192ed00..21f324cb4 100644 --- a/eternalcore-core/build.gradle.kts +++ b/eternalcore-core/build.gradle.kts @@ -48,7 +48,7 @@ eternalShadow { ) // command framework & skull library - library("dev.rollczi.litecommands:bukkit-adventure:2.8.8") + library("dev.rollczi.litecommands:bukkit-adventure:2.8.9") library("dev.rollczi:liteskullapi:1.3.0") libraryRelocate( "dev.rollczi.litecommands", diff --git a/eternalcore-docs-api/build.gradle.kts b/eternalcore-docs-api/build.gradle.kts index 34c5d1b46..67112319a 100644 --- a/eternalcore-docs-api/build.gradle.kts +++ b/eternalcore-docs-api/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compileOnly("com.google.guava:guava:32.1.0-jre") + compileOnly("com.google.guava:guava:32.1.1-jre") compileOnly("com.google.code.gson:gson:2.10.1") - compileOnly("dev.rollczi.litecommands:core:2.8.8") + compileOnly("dev.rollczi.litecommands:core:2.8.9") } diff --git a/eternalcore-docs-generate/build.gradle.kts b/eternalcore-docs-generate/build.gradle.kts index e920cfdaa..eaeb2adac 100644 --- a/eternalcore-docs-generate/build.gradle.kts +++ b/eternalcore-docs-generate/build.gradle.kts @@ -6,9 +6,9 @@ plugins { dependencies { implementation(project(":eternalcore-core")) - implementation("com.google.guava:guava:32.1.0-jre") + implementation("com.google.guava:guava:32.1.1-jre") implementation("com.google.code.gson:gson:2.10.1") - implementation("dev.rollczi.litecommands:core:2.8.8") + implementation("dev.rollczi.litecommands:core:2.8.9") runtimeOnly("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") runtimeOnly("io.papermc:paperlib:1.0.8") @@ -17,7 +17,7 @@ dependencies { runtimeOnly("net.dzikoysk:cdn:1.14.4") runtimeOnly("com.j256.ormlite:ormlite-jdbc:6.1") runtimeOnly("com.zaxxer:HikariCP:5.0.1") - runtimeOnly("dev.rollczi.litecommands:bukkit-adventure:2.8.8") + runtimeOnly("dev.rollczi.litecommands:bukkit-adventure:2.8.9") runtimeOnly("dev.rollczi:liteskullapi:1.3.0") runtimeOnly("org.panda-lang:expressible:1.3.5") runtimeOnly("org.panda-lang:panda-utilities:0.5.3-alpha") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb4..fcb6fca14 100644 --- a/gradlew +++ b/gradlew @@ -130,10 +130,13 @@ location of your Java installation." fi else 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. + if ! command -v java >/dev/null 2>&1 + then + 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 location of your Java installation." + fi fi # Increase the maximum file descriptors if we can.