list Android versions

Flank · May 13, 2021 · 2dfa0a8 · 2dfa0a8
1 parent 26257e6
commit 2dfa0a8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/client/google/AndroidCatalog.kt b/test_runner/src/main/kotlin/ftl/client/google/AndroidCatalog.kt
@@ -7,9 +7,9 @@ import com.google.testing.model.Orientation
 import flank.common.logLn
 import ftl.api.fetchAndroidOsVersion
 import ftl.environment.android.getDescription
-import ftl.environment.android.toCliTable
 import ftl.environment.getLocaleDescription
 import ftl.http.executeWithRetry
+import ftl.presentation.cli.firebase.test.android.versions.toCliTable
 
 /**
  * Contains lists of possible Android device and version ids, as well as checks

diff --git a/test_runner/src/main/kotlin/ftl/domain/ListAndroidVersions.kt b/test_runner/src/main/kotlin/ftl/domain/ListAndroidVersions.kt
@@ -3,8 +3,8 @@ package ftl.domain
 import flank.common.logLn
 import ftl.api.fetchAndroidOsVersion
 import ftl.args.AndroidArgs
-import ftl.environment.android.toCliTable
 import ftl.presentation.Output
+import ftl.presentation.cli.firebase.test.android.versions.toCliTable
 import java.nio.file.Paths
 
 interface ListAndroidVersions : Output {

diff --git a/.../kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt b/.../kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt
@@ -4,9 +4,9 @@ import ftl.api.OsVersion
 import ftl.config.FtlConstants
 import ftl.domain.ListAndroidVersions
 import ftl.domain.invoke
-import ftl.environment.android.prepareDescription
 import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
+import ftl.util.asListOrNull
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/...ent/android/ListAndroidSofwareVersions.kt → ...id/versions/ListAndroidSofwareVersions.kt b/...ent/android/ListAndroidSofwareVersions.kt → ...id/versions/ListAndroidSofwareVersions.kt
@@ -1,4 +1,4 @@
-package ftl.environment.android
+package ftl.presentation.cli.firebase.test.android.versions
 
 import ftl.api.OsVersion
 import ftl.environment.OS_VERSION_ID

diff --git a/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt b/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt
@@ -4,6 +4,7 @@ import ftl.api.TestEnvironment
 import ftl.environment.android.toCliTable
 import ftl.environment.ios.toCliTable
 import ftl.presentation.cli.firebase.test.android.orientations.toCliTable
+import ftl.presentation.cli.firebase.test.android.versions.toCliTable
 import ftl.presentation.cli.firebase.test.ipblocks.toCliTable
 import ftl.presentation.cli.firebase.test.locale.toCliTable
 import ftl.presentation.cli.firebase.test.networkprofiles.toCliTable

diff --git a/test_runner/src/test/kotlin/ftl/android/AndroidCatalogTest.kt b/test_runner/src/test/kotlin/ftl/android/AndroidCatalogTest.kt
@@ -9,6 +9,7 @@ import ftl.api.fetchDeviceModelAndroid
 import ftl.api.fetchLocales
 import ftl.client.google.AndroidCatalog
 import ftl.environment.android.toCliTable
+import ftl.presentation.cli.firebase.test.android.versions.toCliTable
 import ftl.presentation.cli.firebase.test.locale.toCliTable
 import ftl.test.util.FlankTestRunner
 import io.mockk.every