Fix bundle path generation (#24)

Add support for M1

android.go

@@ -48,7 +48,13 @@ func ensureAndroidSdkSetup() error {
 	}
 
 	licenseAcceptCommand := fmt.Sprintf("yes|%s --licenses", sdkManagerPath)
-	return command.RunBashCommand(licenseAcceptCommand)
+	err = command.RunBashCommand(licenseAcceptCommand)
+	if err != nil {
+		return err
+	}
+
+	cmdlineToolsInstallCommand := fmt.Sprintf("yes|%s \"cmdline-tools;7.0\"", sdkManagerPath)
+	return command.RunBashCommand(cmdlineToolsInstallCommand)
 }
 
 func findSdkManagerPath(androidSdkRoot string) (string, error) {

main.go

@@ -83,13 +83,7 @@ func downloadAndExtractReleaseSdk(flutterVersion, flutterSdkDestinationDir strin
 	versionComponents := strings.Split(flutterVersion, "-")
 	channel := versionComponents[len(versionComponents)-1]
 
-	flutterSdkSourceURL := fmt.Sprintf(
-		"https://storage.googleapis.com/flutter_infra_release/releases/%s/%s/flutter_%s_v%s.%s",
-		channel,
-		getFlutterPlatform(),
-		getFlutterPlatform(),
-		flutterVersion,
-		getArchiveExtension())
+	flutterSdkSourceURL := getFlutterSdkSourceURL(flutterVersion, channel)
 
 	flutterSdkParentDir := filepath.Join(flutterSdkDestinationDir, "..")
 
@@ -102,6 +96,25 @@ func downloadAndExtractReleaseSdk(flutterVersion, flutterSdkDestinationDir strin
 	}
 }
 
+func getFlutterSdkSourceURL(flutterVersion string, channel string) string {
+	return fmt.Sprintf(
+		"https://storage.googleapis.com/flutter_infra_release/releases/%s/%s/flutter_%s_%s%s-%s.%s",
+		channel,
+		getFlutterPlatform(),
+		getFlutterPlatform(),
+		getArchitecture(),
+		flutterVersion,
+		channel,
+		getArchiveExtension())
+}
+
+func getArchitecture() string {
+	if runtime.GOARCH == "arm64" {
+		return "arm64_"
+	}
+	return ""
+}
+
 func downloadAndExtractSnapshotSdk(flutterVersion, flutterSdkDestinationDir string) error {
 
 	flutterVersion = normalizeFlutterVersion(flutterVersion)

main_test.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/stretchr/testify/require"
+	"runtime"
+	"testing"
+)
+
+func Test_getFlutterSdkSourceURL(t *testing.T) {
+	if runtime.GOOS == "darwin" {
+		if runtime.GOARCH == "arm64" {
+			require.Equal(t, getFlutterSdkSourceURL("3.0.1", "stable"), "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.0.1-stable.zip")
+			require.Equal(t, getFlutterSdkSourceURL("3.1.0", "beta"), "https://storage.googleapis.com/flutter_infra_release/releases/beta/macos/flutter_macos_arm64_3.1.0-beta.zip")
+		} else {
+			require.Equal(t, getFlutterSdkSourceURL("3.0.1", "stable"), "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.0.1-stable.zip")
+			require.Equal(t, getFlutterSdkSourceURL("3.1.0", "beta"), "https://storage.googleapis.com/flutter_infra_release/releases/beta/macos/flutter_macos_3.1.0-beta.zip")
+		}
+	} else if runtime.GOOS == "linux" {
+		require.Equal(t, getFlutterSdkSourceURL("3.0.1", "stable"), "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.0.1-stable.tar.xz")
+		require.Equal(t, getFlutterSdkSourceURL("3.1.0", "beta"), "https://storage.googleapis.com/flutter_infra_release/releases/beta/linux/flutter_linux_3.1.0-beta.tar.xz")
+	}
+}