From afd0eebdd3287d932c53879fa1ac88f430080ef5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 2 Dec 2022 01:57:02 +0530 Subject: [PATCH] refactor(build-logic): move all code to a single top-level project --- .idea/kotlinc.xml | 2 +- build-logic/android-plugins/build.gradle.kts | 64 ------------------- .../automation-plugins/build.gradle.kts | 48 -------------- .../{kotlin-plugins => }/build.gradle.kts | 47 +++++++++++++- build-logic/settings.gradle.kts | 6 -- .../app/passwordstore/gradle/AndroidCommon.kt | 0 .../passwordstore/gradle/ApplicationPlugin.kt | 0 .../gradle/DependencyUpdatesPlugin.kt | 0 .../passwordstore/gradle/GitHooksPlugin.kt | 0 .../gradle/KotlinAndroidPlugin.kt | 0 .../gradle/KotlinCommonPlugin.kt | 0 .../passwordstore/gradle/KotlinKaptPlugin.kt | 0 .../gradle/KotlinLibraryPlugin.kt | 0 .../app/passwordstore/gradle/KtfmtPlugin.kt | 0 .../app/passwordstore/gradle/LibraryPlugin.kt | 0 .../gradle/PublishedAndroidLibraryPlugin.kt | 0 .../gradle/RenameArtifactsPlugin.kt | 0 .../app/passwordstore/gradle/SentryPlugin.kt | 0 .../gradle/artifacts/CollectApksTask.kt | 0 .../gradle/artifacts/CollectBundleTask.kt | 0 .../gradle/crowdin/CrowdinExtension.kt | 0 .../gradle/crowdin/CrowdinPlugin.kt | 0 .../gradle/flavors/ProductFlavors.kt | 0 .../passwordstore/gradle/flavors/SlimTests.kt | 0 .../gradle/ktfmt/KtfmtCheckTask.kt | 0 .../gradle/ktfmt/KtfmtDiffEntry.kt | 0 .../passwordstore/gradle/ktfmt/KtfmtDiffer.kt | 0 .../gradle/ktfmt/KtfmtFormatTask.kt | 0 .../passwordstore/gradle/psl/PSLUpdateTask.kt | 0 .../gradle/psl/PublicSuffixListPlugin.kt | 0 .../gradle/signing/AppSigning.kt | 0 .../gradle/snapshot/SnapshotExtension.kt | 0 .../passwordstore/gradle/tasks/GitHooks.kt | 0 .../gradle/versioning/Constants.kt | 0 .../gradle/versioning/VersioningPlugin.kt | 0 .../gradle/versioning/VersioningTask.kt | 0 36 files changed, 47 insertions(+), 120 deletions(-) delete mode 100644 build-logic/android-plugins/build.gradle.kts delete mode 100644 build-logic/automation-plugins/build.gradle.kts rename build-logic/{kotlin-plugins => }/build.gradle.kts (51%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt (100%) rename build-logic/{automation-plugins => }/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt (100%) rename build-logic/{automation-plugins => }/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt (100%) rename build-logic/{automation-plugins => }/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffEntry.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt (100%) rename build-logic/{kotlin-plugins => }/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt (100%) rename build-logic/{automation-plugins => }/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt (100%) rename build-logic/{automation-plugins => }/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt (100%) rename build-logic/{automation-plugins => }/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt (100%) rename build-logic/{android-plugins => }/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt (100%) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 0e65ceac..4251b727 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build-logic/android-plugins/build.gradle.kts b/build-logic/android-plugins/build.gradle.kts deleted file mode 100644 index 23a14da0..00000000 --- a/build-logic/android-plugins/build.gradle.kts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - -import org.gradle.api.JavaVersion -import org.gradle.api.tasks.compile.JavaCompile -import org.gradle.kotlin.dsl.withType -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { `kotlin-dsl` } - -afterEvaluate { - tasks.withType().configureEach { - sourceCompatibility = JavaVersion.VERSION_11.toString() - targetCompatibility = JavaVersion.VERSION_11.toString() - } - - tasks.withType().configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - freeCompilerArgs = freeCompilerArgs + "-Xsam-conversions=class" - } - } -} - -gradlePlugin { - plugins { - register("versioning") { - id = "com.github.android-password-store.versioning-plugin" - implementationClass = "app.passwordstore.gradle.versioning.VersioningPlugin" - } - register("android-application") { - id = "com.github.android-password-store.android-application" - implementationClass = "app.passwordstore.gradle.ApplicationPlugin" - } - register("android-library") { - id = "com.github.android-password-store.android-library" - implementationClass = "app.passwordstore.gradle.LibraryPlugin" - } - register("published-android-library") { - id = "com.github.android-password-store.published-android-library" - implementationClass = "app.passwordstore.gradle.PublishedAndroidLibraryPlugin" - } - register("rename-artifacts") { - id = "com.github.android-password-store.rename-artifacts" - implementationClass = "app.passwordstore.gradle.RenameArtifactsPlugin" - } - register("sentry") { - id = "com.github.android-password-store.sentry" - implementationClass = "app.passwordstore.gradle.SentryPlugin" - } - } -} - -dependencies { - implementation(libs.build.agp) - implementation(libs.build.mavenpublish) - implementation(libs.build.metalava) - implementation(libs.build.r8) - implementation(libs.build.semver) - implementation(libs.build.sentry) -} diff --git a/build-logic/automation-plugins/build.gradle.kts b/build-logic/automation-plugins/build.gradle.kts deleted file mode 100644 index 0aa6b3ac..00000000 --- a/build-logic/automation-plugins/build.gradle.kts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ -@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") - -import org.gradle.api.JavaVersion -import org.gradle.api.tasks.compile.JavaCompile -import org.gradle.kotlin.dsl.withType -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { `kotlin-dsl` } - -afterEvaluate { - tasks.withType().configureEach { - sourceCompatibility = JavaVersion.VERSION_11.toString() - targetCompatibility = JavaVersion.VERSION_11.toString() - } - - tasks.withType().configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - freeCompilerArgs = freeCompilerArgs + "-Xsam-conversions=class" - } - } -} - -gradlePlugin { - plugins { - register("crowdin") { - id = "com.github.android-password-store.crowdin-plugin" - implementationClass = "app.passwordstore.gradle.crowdin.CrowdinDownloadPlugin" - } - register("psl") { - id = "com.github.android-password-store.psl-plugin" - implementationClass = "app.passwordstore.gradle.psl.PublicSuffixListPlugin" - } - register("git-hooks") { - id = "com.github.android-password-store.git-hooks" - implementationClass = "app.passwordstore.gradle.GitHooksPlugin" - } - } -} - -dependencies { - implementation(libs.build.download) - implementation(libs.build.okhttp) -} diff --git a/build-logic/kotlin-plugins/build.gradle.kts b/build-logic/build.gradle.kts similarity index 51% rename from build-logic/kotlin-plugins/build.gradle.kts rename to build-logic/build.gradle.kts index fc2147c9..0740d609 100644 --- a/build-logic/kotlin-plugins/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -20,13 +20,32 @@ afterEvaluate { tasks.withType().configureEach { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() - freeCompilerArgs = freeCompilerArgs + "-Xsam-conversions=class" + "-opt-in=kotlin.RequiresOptIn" + freeCompilerArgs = freeCompilerArgs + listOf( + "-Xsam-conversions=class", + "-opt-in=kotlin.RequiresOptIn", + ) } } } gradlePlugin { plugins { + register("android-application") { + id = "com.github.android-password-store.android-application" + implementationClass = "app.passwordstore.gradle.ApplicationPlugin" + } + register("android-library") { + id = "com.github.android-password-store.android-library" + implementationClass = "app.passwordstore.gradle.LibraryPlugin" + } + register("crowdin") { + id = "com.github.android-password-store.crowdin-plugin" + implementationClass = "app.passwordstore.gradle.crowdin.CrowdinDownloadPlugin" + } + register("git-hooks") { + id = "com.github.android-password-store.git-hooks" + implementationClass = "app.passwordstore.gradle.GitHooksPlugin" + } register("kotlin-android") { id = "com.github.android-password-store.kotlin-android" implementationClass = "app.passwordstore.gradle.KotlinAndroidPlugin" @@ -47,6 +66,26 @@ gradlePlugin { id = "com.github.android-password-store.ktfmt" implementationClass = "app.passwordstore.gradle.KtfmtPlugin" } + register("published-android-library") { + id = "com.github.android-password-store.published-android-library" + implementationClass = "app.passwordstore.gradle.PublishedAndroidLibraryPlugin" + } + register("psl") { + id = "com.github.android-password-store.psl-plugin" + implementationClass = "app.passwordstore.gradle.psl.PublicSuffixListPlugin" + } + register("rename-artifacts") { + id = "com.github.android-password-store.rename-artifacts" + implementationClass = "app.passwordstore.gradle.RenameArtifactsPlugin" + } + register("sentry") { + id = "com.github.android-password-store.sentry" + implementationClass = "app.passwordstore.gradle.SentryPlugin" + } + register("versioning") { + id = "com.github.android-password-store.versioning-plugin" + implementationClass = "app.passwordstore.gradle.versioning.VersioningPlugin" + } register("versions") { id = "com.github.android-password-store.versions" implementationClass = "app.passwordstore.gradle.DependencyUpdatesPlugin" @@ -58,9 +97,15 @@ dependencies { implementation(libs.build.agp) implementation(libs.build.detekt) implementation(libs.build.diffutils) + implementation(libs.build.download) implementation(libs.build.kotlin) implementation(libs.build.ktfmt) + implementation(libs.build.mavenpublish) + implementation(libs.build.metalava) + implementation(libs.build.okhttp) implementation(libs.build.r8) + implementation(libs.build.semver) + implementation(libs.build.sentry) implementation(libs.build.vcu) implementation(libs.build.versions) implementation(libs.kotlin.coroutines.core) diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 07992f1a..84b36fa8 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -61,9 +61,3 @@ dependencyResolutionManagement { } } } - -include("android-plugins") - -include("automation-plugins") - -include("kotlin-plugins") diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/DependencyUpdatesPlugin.kt diff --git a/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt similarity index 100% rename from build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/GitHooksPlugin.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinAndroidPlugin.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinKaptPlugin.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinLibraryPlugin.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt diff --git a/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt similarity index 100% rename from build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinExtension.kt diff --git a/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt similarity index 100% rename from build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffEntry.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffEntry.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffEntry.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffEntry.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt diff --git a/build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt similarity index 100% rename from build-logic/kotlin-plugins/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt diff --git a/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt similarity index 100% rename from build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt diff --git a/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt similarity index 100% rename from build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PublicSuffixListPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt diff --git a/build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt similarity index 100% rename from build-logic/automation-plugins/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt diff --git a/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt similarity index 100% rename from build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt rename to build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt