From 30c0ef255a52ecde0f87f01ca34db949dd87cae1 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 1 Jun 2026 16:08:42 -0400 Subject: [PATCH] Upgrade wire to 6.4.0 --- build.gradle.kts | 2 +- gradle/verification-metadata.xml | 224 ++++++++++------------------ wire-handler/lib/build.gradle.kts | 11 +- wire-handler/wire-handler-1.0.0.jar | Bin 5531 -> 5334 bytes 4 files changed, 87 insertions(+), 150 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 242e8c61cf..5589efc75f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,7 @@ buildscript { classpath(libs.gradle) classpath(libs.androidx.navigation.safe.args.gradle.plugin) classpath(libs.protobuf.gradle.plugin) - classpath("com.squareup.wire:wire-gradle-plugin:6.0.0-alpha02") { + classpath("com.squareup.wire:wire-gradle-plugin:6.4.0") { exclude(group = "com.squareup.wire", module = "wire-swift-generator") exclude(group = "com.squareup.wire", module = "wire-grpc-client") exclude(group = "com.squareup.wire", module = "wire-grpc-jvm") diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 549e6d631e..85978e1659 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -13284,6 +13284,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -13500,6 +13505,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -13908,6 +13921,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -14977,6 +14995,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -14985,6 +15008,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -15056,136 +15087,49 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - + + + - - - - + + - - - + + + - - + + - - - - - + + + - - - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + - - - - - - - - - - - - - - + + @@ -15196,44 +15140,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + @@ -17109,6 +17037,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + diff --git a/wire-handler/lib/build.gradle.kts b/wire-handler/lib/build.gradle.kts index 091a41d7ee..8d094a3bdc 100644 --- a/wire-handler/lib/build.gradle.kts +++ b/wire-handler/lib/build.gradle.kts @@ -1,17 +1,18 @@ -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName - plugins { - id("org.jetbrains.kotlin.jvm") version "1.9.20" + id("org.jetbrains.kotlin.jvm") version "2.2.20" `java-library` } version = "1.0.0" -archivesName.set("wire-handler") + +base { + archivesName.set("wire-handler") +} repositories { mavenCentral() } dependencies { - implementation("com.squareup.wire:wire-schema:6.0.0-alpha02") + implementation("com.squareup.wire:wire-schema:6.4.0") } diff --git a/wire-handler/wire-handler-1.0.0.jar b/wire-handler/wire-handler-1.0.0.jar index e36dd90c29b64562b1ad494f9fb7ea4c8aa8bc8f..1d59d8d74e492e566b079eb4e9620e939e21b497 100644 GIT binary patch literal 5334 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 F{s&acG-3b%