From 8855190d7cc65d212aef1926d353ab7377e63eaf Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 12 Jul 2023 16:00:46 +0530 Subject: fix(build): properly resolve JavaPoet version resolution issue --- app/build.gradle.kts | 2 +- build-logic/build.gradle.kts | 1 + build.gradle.kts | 1 - gradle/libs.versions.toml | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3fc03022..b7e93c57 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,7 +12,7 @@ plugins { id("com.github.android-password-store.versioning-plugin") id("com.github.android-password-store.sentry") id("com.github.android-password-store.rename-artifacts") - id("dagger.hilt.android.plugin") + alias(libs.plugins.hilt) } crowdin { diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 06fbd19a..19fb1043 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -80,6 +80,7 @@ dependencies { implementation(libs.build.agp) implementation(libs.build.diffutils) implementation(libs.build.download) + implementation(libs.build.javapoet) implementation(libs.build.kotlin) implementation(libs.build.ktfmt) implementation(libs.build.mavenpublish) diff --git a/build.gradle.kts b/build.gradle.kts index 26d94616..5a688c54 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,5 +6,4 @@ plugins { id("com.github.android-password-store.git-hooks") id("com.github.android-password-store.kotlin-common") id("com.github.android-password-store.ktfmt") - alias(libs.plugins.hilt) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ef203125..3a8ccea6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,6 +40,7 @@ aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embe build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } build-diffutils = "io.github.java-diff-utils:java-diff-utils:4.12" build-download = "de.undercouch:gradle-download-task:5.4.0" +build-javapoet = "com.squareup:javapoet:1.13.0" build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } build-ktfmt = "com.facebook:ktfmt:0.44" build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.25.3" -- cgit v1.2.3