all: re-do package structure yet again

15 files changed, 19 insertions, 19 deletions

diff --git a/passgen/diceware/build.gradle.kts b/passgen/diceware/build.gradle.kts
index 40c703c5..f612b691 100644
--- a/passgen/diceware/build.gradle.kts
+++ b/passgen/diceware/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 android {
   sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
-  namespace = "dev.msfjarvis.aps.passgen.diceware"
+  namespace = "app.passwordstore.passgen.diceware"
 }
 
 dependencies {
diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGenerator.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGenerator.kt
index 62e3b97b..841eb31b 100644
--- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGenerator.kt
+++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGenerator.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 import java.io.InputStream
 import javax.inject.Inject
diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/Die.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/Die.kt
index d6e5aa23..e3db4b80 100644
--- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/Die.kt
+++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/Die.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 import javax.inject.Inject
 
diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/RandomIntGenerator.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/RandomIntGenerator.kt
index 7f957419..18a828a6 100644
--- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/RandomIntGenerator.kt
+++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/RandomIntGenerator.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 /**
  * SAM interface that takes in an [IntRange] and returns a randomly chosen [Int] within its bounds.
diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParser.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/WordListParser.kt
index 5351aaa1..6c7f5310 100644
--- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParser.kt
+++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/WordListParser.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 import java.io.InputStream
 
diff --git a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGeneratorTest.kt b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGeneratorTest.kt
index 236be708..69febaf1 100644
--- a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGeneratorTest.kt
+++ b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGeneratorTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 import kotlin.random.Random
 import kotlin.test.assertEquals
diff --git a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DieTest.kt b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DieTest.kt
index 7f6398f6..725d80f7 100644
--- a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DieTest.kt
+++ b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DieTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 import kotlin.random.Random
 import kotlin.test.Test
diff --git a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParserTest.kt b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/WordListParserTest.kt
index 9364085d..bcb85cb4 100644
--- a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParserTest.kt
+++ b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/WordListParserTest.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package dev.msfjarvis.aps.passgen.diceware
+package app.passwordstore.passgen.diceware
 
 import java.io.InputStream
 import kotlin.test.Test
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGenerator.kt
index fcd28311..4f08904d 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGenerator.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGenerator.kt
@@ -2,10 +2,10 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package dev.msfjarvis.aps.passgen.random
+package app.passwordstore.passgen.random
 
-import dev.msfjarvis.aps.passgen.random.util.clearFlag
-import dev.msfjarvis.aps.passgen.random.util.hasFlag
+import app.passwordstore.passgen.random.util.clearFlag
+import app.passwordstore.passgen.random.util.hasFlag
 
 public object PasswordGenerator {
 
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGeneratorException.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGeneratorException.kt
index b7d70c39..16ebdc90 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGeneratorException.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGeneratorException.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.passgen.random
+package app.passwordstore.passgen.random
 
 public sealed class PasswordGeneratorException(message: String? = null, cause: Throwable? = null) :
   Throwable(message, cause)
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordOption.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordOption.kt
index 70d0da22..ead3b02a 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordOption.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordOption.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.passgen.random
+package app.passwordstore.passgen.random
 
 public enum class PasswordOption(public val key: String) {
   NoDigits("0"),
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomNumberGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomNumberGenerator.kt
index 3bb34325..4ea3a923 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomNumberGenerator.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomNumberGenerator.kt
@@ -2,7 +2,7 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package dev.msfjarvis.aps.passgen.random
+package app.passwordstore.passgen.random
 
 import java.security.SecureRandom
 
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPasswordGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPasswordGenerator.kt
index dcc79ac9..ddb6809c 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPasswordGenerator.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPasswordGenerator.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package dev.msfjarvis.aps.passgen.random
+package app.passwordstore.passgen.random
 
-import dev.msfjarvis.aps.passgen.random.util.hasFlag
+import app.passwordstore.passgen.random.util.hasFlag
 
 internal object RandomPasswordGenerator {
 
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPhonemesGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPhonemesGenerator.kt
index 57dfc1e1..7b62ea4b 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPhonemesGenerator.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPhonemesGenerator.kt
@@ -2,9 +2,9 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-package dev.msfjarvis.aps.passgen.random
+package app.passwordstore.passgen.random
 
-import dev.msfjarvis.aps.passgen.random.util.hasFlag
+import app.passwordstore.passgen.random.util.hasFlag
 import java.util.Locale
 
 internal object RandomPhonemesGenerator {
diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/util/Extensions.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/util/Extensions.kt
index 3b38e22b..71eec63b 100644
--- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/util/Extensions.kt
+++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/util/Extensions.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.aps.passgen.random.util
+package app.passwordstore.passgen.random.util
 
 /** Clears the given [flag] from the value of this [Int] */
 internal infix fun Int.clearFlag(flag: Int): Int {