Analytics: fix crash when flutter|xcodebuild is not installed (#1839)

* Analytics: fix crash when flutter|xcodebuild is not installed * bump version to v1.37.1
mobile-dev-inc · Jul 29, 2024 · fa278cf · fa278cf
1 parent 546198b
commit fa278cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 GROUP=dev.mobile
-VERSION_NAME=1.37.0
+VERSION_NAME=1.37.1
 POM_DESCRIPTION=Maestro is a server-driven platform-agnostic library that allows to drive tests for both iOS and Android using the same implementation through an intuitive API.
 POM_URL=https://github.com/mobile-dev-inc/maestro
 POM_SCM_URL=https://github.com/mobile-dev-inc/maestro
@@ -14,4 +14,4 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=mobile-dev-inc
 POM_DEVELOPER_NAME=mobile.dev inc.
 SONATYPE_STAGING_PROFILE=dev.mobile
-org.gradle.jvmargs=-Xmx2000m
+org.gradle.jvmargs=-Xmx2000m
diff --git a/maestro-cli/gradle.properties b/maestro-cli/gradle.properties
@@ -1 +1 @@
-CLI_VERSION=1.37.0
+CLI_VERSION=1.37.1
diff --git a/maestro-cli/src/main/java/maestro/cli/util/EnvUtils.kt b/maestro-cli/src/main/java/maestro/cli/util/EnvUtils.kt
@@ -6,6 +6,7 @@ import maestro.cli.api.CliVersion
 import maestro.cli.update.Updates
 import maestro.cli.view.red
 import java.io.File
+import java.io.IOException
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.Properties
@@ -89,10 +90,15 @@ object EnvUtils {
     }
 
     fun getFlutterVersionAndChannel(): Pair<String?, String?> {
-        val stdout = runProcess(
-            "flutter",
-            "--no-version-check", "--version", "--machine",
-        ).joinToString(separator = "")
+        val stdout = try {
+             runProcess(
+                "flutter",
+                "--no-version-check", "--version", "--machine",
+            ).joinToString(separator = "")
+        } catch (e: IOException) {
+            // Flutter is probably not installed
+            return Pair(first = null, second = null)
+        }
 
         val mapper = jacksonObjectMapper()
         val version = runCatching {

diff --git a/maestro-cli/src/main/java/maestro/cli/util/IOSEnvUtils.kt b/maestro-cli/src/main/java/maestro/cli/util/IOSEnvUtils.kt
@@ -1,5 +1,6 @@
 package maestro.cli.util
 
+import java.io.IOException
 import kotlin.io.path.Path
 
 object IOSEnvUtils {
@@ -23,7 +24,12 @@ object IOSEnvUtils {
 
     val xcodeVersion: String?
         get() {
-            val lines = runProcess("xcodebuild", "-version")
+            val lines = try {
+                runProcess("xcodebuild", "-version")
+            } catch (e: IOException) {
+                // Xcode toolchain is probably not installed
+                return null
+            }
 
             if (lines.size == 2 && lines.first().contains(' ')) {
                 // Correct xcodebuild invocation is always 2 lines. Example: