Skip to content

Commit

Permalink
Update to 1.20.6 (#168)
Browse files Browse the repository at this point in the history
* Update to 1.20.6

* Bump version to 1.5.0 and use Java 21

* Move to new Buildscan plugin

* Move to actually working shadow Plugin

* Fix some deprecations in Gradle
  • Loading branch information
thelooter committed May 10, 2024
1 parent f70cdb6 commit 241ffdf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '21'
distribution: 'temurin'

- name: Validate Gradle wrapper
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Cache SonarCloud packages
Expand Down
10 changes: 6 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.9.24"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.github.goooler.shadow") version "8.1.7"
jacoco
id("maven-publish")
}
Expand All @@ -13,7 +13,7 @@ repositories {
}

dependencies {
compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
compileOnly("org.jetbrains:annotations:24.1.0")

implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24")
Expand All @@ -24,14 +24,16 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.86.1")
testImplementation("org.hamcrest:hamcrest-library:2.2")

testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

val jarVersion = "1.4.0"
val jarVersion = "1.5.0"

tasks {

java {
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}

shadowJar {
Expand Down
12 changes: 3 additions & 9 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
plugins {
id("com.gradle.enterprise") version("3.17.3")
id("com.gradle.develocity") version "3.17.3"
}

rootProject.name = "eventchecker"

gradleEnterprise {
if (System.getenv("CI") != null) {
buildScan {
publishAlways()
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
}
develocity {
server = "https://scans.gradle.com"
}

0 comments on commit 241ffdf

Please sign in to comment.