Remove rosetta2 hack for macOS.

sdkman · May 13, 2023 · 3795e02 · 3795e02
1 parent ed130f4
commit 3795e02
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/src/jreleaser/distributions/sdkman-cli/brew/formula.rb.tpl b/src/jreleaser/distributions/sdkman-cli/brew/formula.rb.tpl
@@ -23,7 +23,6 @@ class {{brewFormulaName}} < Formula
       sdkman_curl_max_time=10
       sdkman_debug_mode=false
       sdkman_insecure_ssl=false
-      sdkman_rosetta2_compatible=false
       sdkman_selfupdate_feature=false
     EOS
   end

diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh
@@ -70,11 +70,7 @@ function infer_platform() {
 		echo "DarwinX64"
 		;;
 	  arm64)
-		if [[ "$sdkman_rosetta2_compatible" == 'true' ]]; then
-			echo "DarwinX64"
-		else
-			echo "DarwinARM64"
-		fi
+		echo "DarwinX64"
 		;;
 	  *)
 	  	echo "DarwinX64"

diff --git a/src/test/groovy/sdkman/specs/PlatformSpec.groovy b/src/test/groovy/sdkman/specs/PlatformSpec.groovy
@@ -41,22 +41,4 @@ class PlatformSpec extends SdkmanEnvSpecification {
 		"MSYS64" | ""        | "msys64"
 		"CYGWIN" | ""        | "exotic"
 	}
-
-	def "should enable rosetta 2 compatibility mode with environment variable"() {
-		given:
-		unameStub.forKernel("Darwin").forMachine("arm64")
-		bash = sdkmanBashEnvBuilder
-				.withUnameStub(unameStub)
-				.withConfiguration("sdkman_rosetta2_compatible", "true")
-				.build()
-		bash.start()
-		bash.execute("source $bootstrapScript")
-
-		when:
-		bash.execute('echo $SDKMAN_PLATFORM')
-
-		then:
-		!bash.output.contains("darwinarm64")
-		bash.output.contains("darwinx64")
-	}
 }