From 7ed0868c4138b4797127f5ad04a6829ccf087c67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 3 Oct 2025 07:12:06 +0000
Subject: [PATCH 1/2] chore(deps): update gradle to v9

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be2dc79a..a35649f5 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-8.14.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 9133bcd88f845933d17a989e689a72a635bf5784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20August=C3=BDn?= <michal.augustyn@gendigital.com>
Date: Fri, 3 Oct 2025 10:18:25 +0200
Subject: [PATCH 2/2] chore: Gradle 9 adjustments

---
 api/build.gradle              | 4 +++-
 build.gradle                  | 5 +----
 core/build.gradle             | 4 +++-
 extras-circe/build.gradle     | 4 +++-
 extras-protobuf/build.gradle  | 4 +++-
 extras-scalapb/build.gradle   | 4 +++-
 extras/build.gradle           | 4 +++-
 pureconfig/build.gradle       | 4 +++-
 recovery-testing/build.gradle | 4 +++-
 9 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index cea90469..584a557c 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,4 +1,6 @@
-archivesBaseName = "rabbitmq-client-api_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-api_$scalaVersion")
+}
 
 dependencies {
     api "com.avast.bytes:bytes-core:${bytesVersion}"
diff --git a/build.gradle b/build.gradle
index d9521195..b1f74b0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,7 +96,7 @@ subprojects {
                 publications {
                     mavenJava(MavenPublication) {
                         from(components.java)
-                        artifactId = archivesBaseName
+                        artifactId = tasks.jar.archiveBaseName.get()
                         pom {
                             name = 'RabbitMQ client for Scala'
                             description = 'Scala wrapper over standard RabbitMQ Java client library'
@@ -148,9 +148,6 @@ subprojects {
         }
     }
 
-    sourceCompatibility = '1.8'
-    targetCompatibility = '1.8'
-
     repositories {
         mavenCentral()
     }
diff --git a/core/build.gradle b/core/build.gradle
index 46b4e18e..c39a35df 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'docker-compose'
 apply plugin: 'com.google.protobuf'
 
-archivesBaseName = "rabbitmq-client-core_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-core_$scalaVersion")
+}
 
 protobuf {
     protoc {
diff --git a/extras-circe/build.gradle b/extras-circe/build.gradle
index 7b8318d1..f5042c21 100644
--- a/extras-circe/build.gradle
+++ b/extras-circe/build.gradle
@@ -1,4 +1,6 @@
-archivesBaseName = "rabbitmq-client-extras-circe_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-extras-circe_$scalaVersion")
+}
 
 dependencies {
     api project(":core")
diff --git a/extras-protobuf/build.gradle b/extras-protobuf/build.gradle
index 6e7c018c..f1f90f3e 100644
--- a/extras-protobuf/build.gradle
+++ b/extras-protobuf/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.google.protobuf'
 
-archivesBaseName = "rabbitmq-client-extras-protobuf_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-extras-protobuf_$scalaVersion")
+}
 
 dependencies {
     api project(":core")
diff --git a/extras-scalapb/build.gradle b/extras-scalapb/build.gradle
index 06627b44..8a300a6d 100644
--- a/extras-scalapb/build.gradle
+++ b/extras-scalapb/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.google.protobuf'
 
-archivesBaseName = "rabbitmq-client-extras-scalapb_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-extras-scalapb_$scalaVersion")
+}
 
 dependencies {
     api project(":core")
diff --git a/extras/build.gradle b/extras/build.gradle
index cd4ea29e..db809613 100644
--- a/extras/build.gradle
+++ b/extras/build.gradle
@@ -1,4 +1,6 @@
-archivesBaseName = "rabbitmq-client-extras_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-extras_$scalaVersion")
+}
 
 dependencies {
     api project(":core")
diff --git a/pureconfig/build.gradle b/pureconfig/build.gradle
index b6012ea5..470f80ab 100644
--- a/pureconfig/build.gradle
+++ b/pureconfig/build.gradle
@@ -1,4 +1,6 @@
-archivesBaseName = "rabbitmq-client-pureconfig_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-pureconfig_$scalaVersion")
+}
 
 dependencies {
     api project(":core")
diff --git a/recovery-testing/build.gradle b/recovery-testing/build.gradle
index 5e1aeefe..c6bee8e6 100644
--- a/recovery-testing/build.gradle
+++ b/recovery-testing/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'docker-compose'
 
-archivesBaseName = "rabbitmq-client-core_$scalaVersion"
+tasks.jar.configure {
+    archiveBaseName.set("rabbitmq-client-core_$scalaVersion")
+}
 
 dockerCompose.isRequiredBy(test)