all: re-do package structure yet again

9 files changed, 15 insertions, 21 deletions

diff --git a/format-common/src/main/AndroidManifest.xml b/format-common/src/main/AndroidManifest.xml
deleted file mode 100644
index 4148bbbb..00000000
--- a/format-common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<manifest package="dev.msfjarvis.aps.format_common" />
diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt b/format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt
index a0a85f3e..9543eb8c 100644
--- a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt
+++ b/format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.data.passfile
+package app.passwordstore.data.passfile
 
+import app.passwordstore.util.time.UserClock
+import app.passwordstore.util.totp.Otp
+import app.passwordstore.util.totp.TotpFinder
 import com.github.michaelbull.result.mapBoth
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import dev.msfjarvis.aps.util.time.UserClock
-import dev.msfjarvis.aps.util.totp.Otp
-import dev.msfjarvis.aps.util.totp.TotpFinder
 import kotlin.collections.set
 import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration.Companion.seconds
diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/Totp.kt b/format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt
index a43cce6a..2f42977b 100644
--- a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/Totp.kt
+++ b/format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.data.passfile
+package app.passwordstore.data.passfile
 
 import kotlin.time.Duration
 import kotlin.time.ExperimentalTime
diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/time/Clocks.kt b/format-common/src/main/kotlin/app/passwordstore/util/time/Clocks.kt
index 087a5028..4ffeb6a6 100644
--- a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/time/Clocks.kt
+++ b/format-common/src/main/kotlin/app/passwordstore/util/time/Clocks.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.util.time
+package app.passwordstore.util.time
 
 import java.time.Clock
 import java.time.Instant
diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/Otp.kt b/format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt
index 1a548d92..72d5cffe 100644
--- a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/Otp.kt
+++ b/format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.util.totp
+package app.passwordstore.util.totp
 
 import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.runCatching
diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/TotpFinder.kt b/format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt
index 1cb7de97..d53d76dc 100644
--- a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/TotpFinder.kt
+++ b/format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.util.totp
+package app.passwordstore.util.totp
 
 /** Defines a class that can extract relevant parts of a TOTP URL for use by the app. */
 public interface TotpFinder {
diff --git a/format-common/src/test/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntryTest.kt b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
index 27fbe0e2..f492604d 100644
--- a/format-common/src/test/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntryTest.kt
+++ b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.data.passfile
+package app.passwordstore.data.passfile
 
 import app.cash.turbine.test
-import dev.msfjarvis.aps.test.CoroutineTestRule
-import dev.msfjarvis.aps.util.time.TestUserClock
-import dev.msfjarvis.aps.util.time.UserClock
-import dev.msfjarvis.aps.util.totp.TotpFinder
+import app.passwordstore.test.CoroutineTestRule
+import app.passwordstore.util.time.TestUserClock
+import app.passwordstore.util.time.UserClock
+import app.passwordstore.util.totp.TotpFinder
 import java.util.Locale
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/time/TestClocks.kt b/format-common/src/test/kotlin/app/passwordstore/util/time/TestClocks.kt
index ee74a40d..8a860a39 100644
--- a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/time/TestClocks.kt
+++ b/format-common/src/test/kotlin/app/passwordstore/util/time/TestClocks.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.util.time
+package app.passwordstore.util.time
 
 import java.time.Clock
 import java.time.Instant
diff --git a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/totp/OtpTest.kt b/format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt
index db74de3e..bf8cd186 100644
--- a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/totp/OtpTest.kt
+++ b/format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.util.totp
+package app.passwordstore.util.totp
 
 import com.github.michaelbull.result.get
 import kotlin.test.Test