Skip to content

Commit

Permalink
update to java 21 and mdgp 9 (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jul 5, 2024
2 parents 1ad1929 + fb7b61f commit 915022e
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 27 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
build:
runs-on: ubuntu-latest
needs: [ gradle_wrapper_validation ]
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
permissions:
contents: write
issues: write
Expand All @@ -42,7 +41,7 @@ jobs:
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
with:
distribution: adopt
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@aff52e5be96935327d77c5529075184377dc4371 # v3
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.9.22" apply false
kotlin("jvm") version "2.0.0" apply false
id("dev.mythicdrops.gradle.project")
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package io.pixeloutlaw.kindling
/**
* Logger implementation used for testing the logic in [Logger].
*/
class TestLogger(override val minimumLogLevel: Log.Level) : Logger() {
class TestLogger(
override val minimumLogLevel: Log.Level,
) : Logger() {
val loggedMessages = mutableListOf<LogRecord>()

override fun print(logRecord: LogRecord) {
Expand Down
11 changes: 6 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ pluginManagement {

plugins {
// See https://jmfayard.github.io/refreshVersions
id("de.fayard.refreshVersions") version "0.60.3"
id("com.gradle.enterprise") version "3.16.2"
id("de.fayard.refreshVersions") version "0.60.5"
id("com.gradle.develocity") version "3.17.5"
}

gradleEnterprise {
develocity {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
publishing.onlyIf { it.buildResult.failures.isNotEmpty() && !System.getenv("CI").isNullOrEmpty() }
termsOfUseUrl = "https://gradle.com/terms-of-service"
termsOfUseAgree = "yes"
}
}

Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=4.0.*
version=5.0.*
28 changes: 23 additions & 5 deletions versions.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
#### Dependencies and Plugin versions with their available updates.
#### Generated by `./gradlew refreshVersions` version 0.60.3
#### Generated by `./gradlew refreshVersions` version 0.60.5
####
#### Don't manually edit or split the comments that start with four hashtags (####),
#### they will be overwritten by refreshVersions.
####
#### suppress inspection "SpellCheckingInspection" for whole file
#### suppress inspection "UnusedProperty" for whole file

plugin.dev.mythicdrops.gradle.project=7.0.0
plugin.dev.mythicdrops.gradle.project=9.0.0
## # available=7.0.1
## # available=7.0.2
## # available=7.1.0
## # available=7.1.1
## # available=7.1.2
## # available=7.2.0
## # available=8.0.0
## # available=9.0.0

plugin.org.jetbrains.kotlinx.binary-compatibility-validator=0.14.0
## # available=0.15.0-Beta.1
## # available=0.15.0-Beta.2
## # available=0.15.0-Beta.3

version.com.willowtreeapps.assertk..assertk-jvm=0.28.0
version.com.willowtreeapps.assertk..assertk-jvm=0.28.1
## # available=0.28.1

version.junit=5.10.1
version.junit=5.10.3
### available=5.10.2
### available=5.10.3
### available=5.11.0-M1
### available=5.11.0-M2

version.mockk=1.13.9
version.mockk=1.13.11
### available=1.13.10
### available=1.13.11

0 comments on commit 915022e

Please sign in to comment.