From b619a424d372daa1eab08157ae47cb9e30cde052 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 21 Feb 2024 17:16:47 +0100 Subject: [PATCH 1/4] Upgrade to Gradle 8.4 --- .github/workflows/build-and-publish.yaml | 2 +- .github/workflows/release.yaml | 2 +- build.gradle.kts | 15 ++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index d05d07b..ec1d95d 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -8,7 +8,7 @@ on: jobs: build-and-publish: name: Java Gradle - uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.40.5 + uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.40.6 with: java-version: 17 secrets: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b139422..6a30c40 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ on: jobs: java-gradle-release: name: Java Gradle - uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.40.5 + uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.40.6 with: java-version: 17 release-type: "${{ inputs.release-type }}" diff --git a/build.gradle.kts b/build.gradle.kts index 49c1aa0..71a4a0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ plugins { // release id("net.researchgate.release") version "3.0.2" - id("com.bakdata.sonar") version "1.1.11" - id("com.bakdata.sonatype") version "1.1.11" - id("org.hildan.github.changelog") version "1.12.1" - id("io.freefair.lombok") version "6.6.1" apply false + id("com.bakdata.sonar") version "1.1.16" + id("com.bakdata.sonatype") version "1.1.14" + id("org.hildan.github.changelog") version "2.2.0" + id("io.freefair.lombok") version "8.4" apply false } allprojects { @@ -51,9 +51,10 @@ configure { subprojects { apply(plugin = "java-library") apply(plugin = "io.freefair.lombok") - configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } } tasks.withType { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b22d05..309b4e1 100644 --- 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-7.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 68c2b97e7225cfef65e28a623903ebeea04cf91c Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Wed, 21 Feb 2024 18:33:29 +0100 Subject: [PATCH 2/4] Upgrade to Gradle 8.4 --- build.gradle.kts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 71a4a0d..2ab24e0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,24 @@ +buildscript { + repositories { + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } + } + dependencies { + classpath("com.bakdata.gradle:sonar:1.1.17-SNAPSHOT") + } +} + plugins { // release id("net.researchgate.release") version "3.0.2" - id("com.bakdata.sonar") version "1.1.16" id("com.bakdata.sonatype") version "1.1.14" id("org.hildan.github.changelog") version "2.2.0" id("io.freefair.lombok") version "8.4" apply false } +apply(plugin = "com.bakdata.sonar") + allprojects { group = "com.bakdata.${rootProject.name}" @@ -51,7 +63,7 @@ configure { subprojects { apply(plugin = "java-library") apply(plugin = "io.freefair.lombok") - java { + configure { toolchain { languageVersion = JavaLanguageVersion.of(11) } From 5b2a6fb501750b9bf87fb3f5d7171819c168c18e Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 22 Feb 2024 09:13:22 +0100 Subject: [PATCH 3/4] Upgrade to Gradle 8.4 --- build.gradle.kts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2ab24e0..f8e2015 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,24 +1,12 @@ -buildscript { - repositories { - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots") - } - } - dependencies { - classpath("com.bakdata.gradle:sonar:1.1.17-SNAPSHOT") - } -} - plugins { // release id("net.researchgate.release") version "3.0.2" + id("com.bakdata.sonar") version "1.1.17" id("com.bakdata.sonatype") version "1.1.14" id("org.hildan.github.changelog") version "2.2.0" id("io.freefair.lombok") version "8.4" apply false } -apply(plugin = "com.bakdata.sonar") - allprojects { group = "com.bakdata.${rootProject.name}" From 8228c77d7958d58f709ccab6cd7f9a3d7bb54779 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 22 Feb 2024 09:15:33 +0100 Subject: [PATCH 4/4] Upgrade to Gradle 8.4 --- fluent-kafka-streams-tests/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluent-kafka-streams-tests/build.gradle.kts b/fluent-kafka-streams-tests/build.gradle.kts index 0a7f8c4..0c5dbab 100644 --- a/fluent-kafka-streams-tests/build.gradle.kts +++ b/fluent-kafka-streams-tests/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.davidmc24.gradle.plugin.avro") version "1.5.0" + id("com.github.davidmc24.gradle.plugin.avro") version "1.9.1" id("com.google.protobuf") version "0.9.1" java idea // required for protobuf support in intellij