refactor: Change packages of command

Flank · Mar 2, 2021 · 4daa3b9 · 4daa3b9
1 parent 214cd8d
commit 4daa3b9
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 16 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt
@@ -1,12 +1,12 @@
 package ftl.cli.firebase.test
 
 import ftl.cli.firebase.test.android.AndroidDoctorCommand
+import ftl.cli.firebase.test.android.AndroidLocalesCommand
+import ftl.cli.firebase.test.android.AndroidModelsCommand
+import ftl.cli.firebase.test.android.AndroidOrientationsCommand
 import ftl.cli.firebase.test.android.AndroidRunCommand
 import ftl.cli.firebase.test.android.AndroidTestEnvironmentCommand
-import ftl.cli.firebase.test.android.configuration.AndroidLocalesCommand
-import ftl.cli.firebase.test.android.models.AndroidModelsCommand
-import ftl.cli.firebase.test.android.orientations.AndroidOrientationsCommand
-import ftl.cli.firebase.test.android.versions.AndroidVersionsCommand
+import ftl.cli.firebase.test.android.AndroidVersionsCommand
 import picocli.CommandLine
 import picocli.CommandLine.Command
 

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt
@@ -1,12 +1,12 @@
 package ftl.cli.firebase.test
 
 import ftl.cli.firebase.test.ios.IosDoctorCommand
+import ftl.cli.firebase.test.ios.IosLocalesCommand
+import ftl.cli.firebase.test.ios.IosModelsCommand
+import ftl.cli.firebase.test.ios.IosOrientationsCommand
 import ftl.cli.firebase.test.ios.IosRunCommand
 import ftl.cli.firebase.test.ios.IosTestEnvironmentCommand
-import ftl.cli.firebase.test.ios.configuration.IosLocalesCommand
-import ftl.cli.firebase.test.ios.models.IosModelsCommand
-import ftl.cli.firebase.test.ios.orientations.IosOrientationsCommand
-import ftl.cli.firebase.test.ios.versions.IosVersionsCommand
+import ftl.cli.firebase.test.ios.IosVersionsCommand
 import picocli.CommandLine
 import picocli.CommandLine.Command
 

diff --git a/...id/configuration/AndroidLocalesCommand.kt → ...ase/test/android/AndroidLocalesCommand.kt b/...id/configuration/AndroidLocalesCommand.kt → ...ase/test/android/AndroidLocalesCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.android.configuration
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.configuration.AndroidLocalesDescribeCommand
+import ftl.cli.firebase.test.android.configuration.AndroidLocalesListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...st/android/models/AndroidModelsCommand.kt → ...base/test/android/AndroidModelsCommand.kt b/...st/android/models/AndroidModelsCommand.kt → ...base/test/android/AndroidModelsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.android.models
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.models.AndroidModelDescribeCommand
+import ftl.cli.firebase.test.android.models.AndroidModelsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...rientations/AndroidOrientationsCommand.kt → ...est/android/AndroidOrientationsCommand.kt b/...rientations/AndroidOrientationsCommand.kt → ...est/android/AndroidOrientationsCommand.kt
@@ -1,5 +1,6 @@
-package ftl.cli.firebase.test.android.orientations
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.orientations.AndroidOrientationsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...ndroid/versions/AndroidVersionsCommand.kt → ...se/test/android/AndroidVersionsCommand.kt b/...ndroid/versions/AndroidVersionsCommand.kt → ...se/test/android/AndroidVersionsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.android.versions
+package ftl.cli.firebase.test.android
 
+import ftl.cli.firebase.test.android.versions.AndroidVersionsDescribeCommand
+import ftl.cli.firebase.test.android.versions.AndroidVersionsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...st/ios/configuration/IosLocalesCommand.kt → ...li/firebase/test/ios/IosLocalesCommand.kt b/...st/ios/configuration/IosLocalesCommand.kt → ...li/firebase/test/ios/IosLocalesCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.ios.configuration
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.configuration.IosLocalesDescribeCommand
+import ftl.cli.firebase.test.ios.configuration.IosLocalesListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...ebase/test/ios/models/IosModelsCommand.kt → ...cli/firebase/test/ios/IosModelsCommand.kt b/...ebase/test/ios/models/IosModelsCommand.kt → ...cli/firebase/test/ios/IosModelsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.ios.models
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.models.IosModelDescribeCommand
+import ftl.cli.firebase.test.ios.models.IosModelsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...os/orientations/IosOrientationsCommand.kt → ...rebase/test/ios/IosOrientationsCommand.kt b/...os/orientations/IosOrientationsCommand.kt → ...rebase/test/ios/IosOrientationsCommand.kt
@@ -1,5 +1,6 @@
-package ftl.cli.firebase.test.ios.orientations
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.orientations.IosOrientationsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...e/test/ios/versions/IosVersionsCommand.kt → ...i/firebase/test/ios/IosVersionsCommand.kt b/...e/test/ios/versions/IosVersionsCommand.kt → ...i/firebase/test/ios/IosVersionsCommand.kt
@@ -1,5 +1,7 @@
-package ftl.cli.firebase.test.ios.versions
+package ftl.cli.firebase.test.ios
 
+import ftl.cli.firebase.test.ios.versions.IosVersionsDescribeCommand
+import ftl.cli.firebase.test.ios.versions.IosVersionsListCommand
 import picocli.CommandLine
 
 @CommandLine.Command(