Merge branch 'main' into fix/flows_order

Author: bartekpacia

.github/workflows/test-e2e.yaml

@@ -6,10 +6,14 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: Build on Java ${{ matrix.java-version }}
     runs-on: macos-latest
     timeout-minutes: 20
 
+    strategy:
+      matrix:
+        java-version: [11, 17]
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -18,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: ${{ matrix.java-version }}
           cache: gradle
 
       - name: Build xctest-runner
@@ -29,7 +33,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: maestro-cli
+          name: maestro-cli-jdk${{ matrix.java-version }}-run_id${{ github.run_id }}
           path: maestro-cli/build/distributions/maestro.zip
           retention-days: 1
 
@@ -63,7 +67,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: maestro-cli
+          name: maestro-cli-jdk11-run_id${{ github.run_id }}
 
       - name: Add Maestro CLI executable to PATH
         run: |

.github/workflows/test.yaml

@@ -6,8 +6,13 @@ on:
 
 jobs:
   test:
+    name: Test on Java ${{ matrix.java-version }}
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        java-version: [11, 17]
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -16,7 +21,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: ${{ matrix.java-version }}
           cache: gradle
 
       - name: Test

maestro-cli/src/main/java/maestro/cli/App.kt

@@ -71,7 +71,7 @@ class App {
     @Option(names = ["-v", "--version"], versionHelp = true, description = ["Display CLI version"])
     var requestedVersion: Boolean? = false
 
-    @Option(names = ["-p", "--platform"], hidden = true)
+    @Option(names = ["-p", "--platform"], description = ["(Optional) Select a platform to run on"])
     var platform: String? = null
 
     @Option(names = ["--host"], hidden = true)

maestro-cli/src/main/java/maestro/cli/command/CloudCommand.kt

@@ -33,6 +33,7 @@ import picocli.CommandLine.Option
 import java.io.File
 import java.util.concurrent.Callable
 import java.util.concurrent.TimeUnit
+import maestro.orchestra.util.Env.withDefaultEnvVars
 
 @CommandLine.Command(
     name = "cloud",
@@ -172,6 +173,10 @@ class CloudCommand : Callable<Int> {
             }
         }
 
+        env = env
+            .withInjectedShellEnvVars()
+            .withDefaultEnvVars(flowsFile)
+
         return CloudInteractor(
             client = ApiClient(apiUrl),
             failOnTimeout = failOnTimeout,
@@ -181,7 +186,7 @@ class CloudCommand : Callable<Int> {
             flowFile = flowsFile,
             appFile = appFile,
             mapping = mapping,
-            env = env.withInjectedShellEnvVars(),
+            env = env,
             uploadName = uploadName,
             repoOwner = repoOwner,
             repoName = repoName,

maestro-cli/src/main/java/maestro/cli/command/PrintHierarchyCommand.kt

@@ -63,6 +63,7 @@ class PrintHierarchyCommand : Runnable {
             port = parent?.port,
             driverHostPort = parent?.port,
             deviceId = parent?.deviceId,
+            platform = parent?.platform,
         ) { session ->
             Insights.onInsightsUpdated {
                 val message = StringBuilder()

maestro-cli/src/main/java/maestro/cli/command/QueryCommand.kt

@@ -67,7 +67,8 @@ class QueryCommand : Runnable {
             host = parent?.host,
             port = parent?.port,
             driverHostPort = parent?.port,
-            deviceId = parent?.deviceId
+            deviceId = parent?.deviceId,
+            platform = parent?.platform,
         ) { session ->
             val filters = mutableListOf<ElementFilter>()
 

maestro-cli/src/main/java/maestro/cli/command/RecordCommand.kt

@@ -35,6 +35,7 @@ import picocli.CommandLine
 import picocli.CommandLine.Option
 import java.io.File
 import java.util.concurrent.Callable
+import maestro.cli.device.Platform
 
 @CommandLine.Command(
     name = "record",
@@ -76,19 +77,15 @@ class RecordCommand : Callable<Int> {
             )
         }
 
-        if (parent?.platform != null) {
-            throw CliError("--platform option was deprecated. You can remove it to run your test.")
-        }
-
-
         TestDebugReporter.install(debugOutputPathAsString = debugOutput, printToConsole = parent?.verbose == true)
         val path = TestDebugReporter.getDebugOutputPath()
 
         return MaestroSessionManager.newSession(
             host = parent?.host,
             port = parent?.port,
             driverHostPort = parent?.port,
-            deviceId = parent?.deviceId
+            deviceId = parent?.deviceId,
+            platform = parent?.platform,
         ) { session ->
             val maestro = session.maestro
             val device = session.device

maestro-cli/src/main/java/maestro/cli/command/StudioCommand.kt

@@ -46,9 +46,6 @@ class StudioCommand : Callable<Int> {
     private var noWindow: Boolean? = null
 
     override fun call(): Int {
-        if (parent?.platform != null) {
-            throw CliError("--platform option was deprecated. You can remove it to run your test.")
-        }
 
         TestDebugReporter.install(debugOutputPathAsString = debugOutput, printToConsole = parent?.verbose == true)
 
@@ -57,6 +54,7 @@ class StudioCommand : Callable<Int> {
             port = parent?.port,
             driverHostPort = parent?.port,
             deviceId = parent?.deviceId,
+            platform = parent?.platform,
             isStudio = true
         ) { session ->
             val port = getFreePort()