all: re-do package structure yet again

15 files changed, 24 insertions, 24 deletions

diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
index 9cf3b9f5..b90666c9 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommon.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
@@ -1,7 +1,7 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.flavors.configureSlimTests
 import com.android.build.gradle.TestedExtension
-import dev.msfjarvis.aps.gradle.flavors.configureSlimTests
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/ApplicationPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
index 79c3a4a0..bf759b3c 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/ApplicationPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt
@@ -1,13 +1,13 @@
 @file:Suppress("UnstableApiUsage")
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.flavors.FlavorDimensions
+import app.passwordstore.gradle.flavors.ProductFlavors
+import app.passwordstore.gradle.signing.configureBuildSigning
+import app.passwordstore.gradle.snapshot.SnapshotExtension
 import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import dev.msfjarvis.aps.gradle.flavors.FlavorDimensions
-import dev.msfjarvis.aps.gradle.flavors.ProductFlavors
-import dev.msfjarvis.aps.gradle.signing.configureBuildSigning
-import dev.msfjarvis.aps.gradle.snapshot.SnapshotExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/LibraryPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt
index 4d2c7ee3..22cc8ca3 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/LibraryPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/LibraryPlugin.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import com.android.build.gradle.LibraryPlugin
 import org.gradle.api.Plugin
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/PublishedAndroidLibraryPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt
index fea0c022..acbb1eb2 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/PublishedAndroidLibraryPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/PublishedAndroidLibraryPlugin.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.MavenPublishPlugin
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/RenameArtifactsPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt
index 971e3245..04eb57e3 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/RenameArtifactsPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/RenameArtifactsPlugin.kt
@@ -1,10 +1,10 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.artifacts.CollectApksTask
+import app.passwordstore.gradle.artifacts.CollectBundleTask
 import com.android.build.api.artifact.SingleArtifact
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import dev.msfjarvis.aps.gradle.artifacts.CollectApksTask
-import dev.msfjarvis.aps.gradle.artifacts.CollectBundleTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SentryPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt
index 2e5991e4..c18e1b79 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SentryPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/SentryPlugin.kt
@@ -1,8 +1,8 @@
-package dev.msfjarvis.aps.gradle
+package app.passwordstore.gradle
 
+import app.passwordstore.gradle.flavors.FlavorDimensions
+import app.passwordstore.gradle.flavors.ProductFlavors
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import dev.msfjarvis.aps.gradle.flavors.FlavorDimensions
-import dev.msfjarvis.aps.gradle.flavors.ProductFlavors
 import io.sentry.android.gradle.SentryPlugin
 import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.extensions.SentryPluginExtension
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt
index 39c95a9e..4f74136c 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectApksTask.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectApksTask.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle.artifacts
+package app.passwordstore.gradle.artifacts
 
 import com.android.build.api.variant.BuiltArtifactsLoader
 import java.nio.file.Files
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt
index c454d49f..b627a674 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/artifacts/CollectBundleTask.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/artifacts/CollectBundleTask.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.gradle.artifacts
+package app.passwordstore.gradle.artifacts
 
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/ProductFlavors.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt
index be474bce..e4b5c739 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/ProductFlavors.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/ProductFlavors.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.flavors
+package app.passwordstore.gradle.flavors
 
 object FlavorDimensions {
   const val FREE = "free"
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/SlimTests.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt
index d89d0ba7..8755a872 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/flavors/SlimTests.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.flavors
+package app.passwordstore.gradle.flavors
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/signing/AppSigning.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt
index 8da96230..4b5c7130 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/signing/AppSigning.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/signing/AppSigning.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.signing
+package app.passwordstore.gradle.signing
 
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import java.util.Properties
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/snapshot/SnapshotExtension.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt
index ba6265cd..191620d1 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/snapshot/SnapshotExtension.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/snapshot/SnapshotExtension.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.snapshot
+package app.passwordstore.gradle.snapshot
 
 abstract class SnapshotExtension {
   abstract var snapshot: Boolean
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/Constants.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt
index 0d6f5c67..52746c37 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/Constants.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/Constants.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.versioning
+package app.passwordstore.gradle.versioning
 
 const val VERSIONING_PROP_FILE = "version.properties"
 const val VERSIONING_PROP_VERSION_NAME = "versioning-plugin.versionName"
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningPlugin.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt
index 5272dd8a..5fda1a25 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.versioning
+package app.passwordstore.gradle.versioning
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.VariantOutputConfiguration
diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningTask.kt b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt
index b39fdaa4..7eb19a89 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/versioning/VersioningTask.kt
+++ b/build-logic/android-plugins/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningTask.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.gradle.versioning
+package app.passwordstore.gradle.versioning
 
 import com.vdurmont.semver4j.Semver
 import org.gradle.api.DefaultTask