From f6cdc603f14d80a9847908d91f0b97b49680c3b6 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 14 Jun 2026 11:09:51 -0400 Subject: [PATCH 1/2] Remove unnecessary java poet resolution --- build-logic/plugins/build.gradle.kts | 7 ------- gradle/libs.versions.toml | 4 ---- 2 files changed, 11 deletions(-) diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts index d9bfd96..43d8d19 100644 --- a/build-logic/plugins/build.gradle.kts +++ b/build-logic/plugins/build.gradle.kts @@ -7,13 +7,6 @@ dependencies { implementation(libs.composeCompiler.gradlePlugin) implementation(libs.kotlin.gradlePlugin) - // TODO: Fixes dependency conflict issues with Dagger/Hilt, re: https://github.com/google/dagger/issues/3068. - implementation(libs.javapoet) { - because( - "Required for fixing dependency conflict with Dagger/Hilt 2.40.2 and above (see https://github.com/google/dagger/issues/3068)" - ) - } - // TODO: Fixes dependency analysis resolution conflict, re: https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1240 implementation(libs.google.guava) { because( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 02a73b5..aad0a8c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,6 @@ dependencyAnalysis = "3.15.0" googleAccompanist = "0.36.0" googleGuava = "33.6.0-jre" googleMaterial = "1.14.0" -javapoet = "1.13.0" junit4 = "4.13.2" junitJupiterBom = "6.1.0" kotlin = "2.4.0" @@ -58,9 +57,6 @@ hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", ve hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" } hilt-navigationCompose = { module = "androidx.hilt:hilt-navigation-compose", version = "1.3.0" } -# Java Poet (For fixing dependency issue in Gradle with Dagger/Hilt) -javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" } - # JavaX javax-inject = { module = "javax.inject:javax.inject", version = "1" } From 20779a22f53d803bc9b38e6afb5e3f982914b1f3 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Sun, 14 Jun 2026 11:29:04 -0400 Subject: [PATCH 2/2] Remove guava dep and apply fix for dependency analysis plugin --- build-logic/plugins/build.gradle.kts | 7 ------- build.gradle.kts | 3 +++ gradle/libs.versions.toml | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts index 43d8d19..23bc9db 100644 --- a/build-logic/plugins/build.gradle.kts +++ b/build-logic/plugins/build.gradle.kts @@ -6,13 +6,6 @@ dependencies { implementation(libs.android.gradlePlugin) implementation(libs.composeCompiler.gradlePlugin) implementation(libs.kotlin.gradlePlugin) - - // TODO: Fixes dependency analysis resolution conflict, re: https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1240 - implementation(libs.google.guava) { - because( - "Required for fixing dependency conflict with Dependency Analysis 1.33.0 and above (see https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1240)" - ) - } } gradlePlugin { diff --git a/build.gradle.kts b/build.gradle.kts index 0f7f916..545ba7d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,4 +14,7 @@ buildscript { mavenCentral() gradlePluginPortal() } + dependencies { + classpath(libs.kotlin.metadata.jvm) + } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aad0a8c..65b7f66 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,6 @@ dagger = "2.59.2" kotlinMetadata = "2.4.0" dependencyAnalysis = "3.15.0" googleAccompanist = "0.36.0" -googleGuava = "33.6.0-jre" googleMaterial = "1.14.0" junit4 = "4.13.2" junitJupiterBom = "6.1.0" @@ -48,7 +47,6 @@ dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" } # Google google-accompanist-systemUiController = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "googleAccompanist" } -google-guava = { module = "com.google.guava:guava", version.ref = "googleGuava" } google-material = { module = "com.google.android.material:material", version.ref = "googleMaterial" } # Hilt