diff --git a/src/jreleaser/distributions/sdkman-cli/brew/formula.rb.tpl b/src/jreleaser/distributions/sdkman-cli/brew/formula.rb.tpl index 93072611c..534063f10 100644 --- 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 index 7ccbcd29f..178d35039 100644 --- 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 "DarwinARM64" ;; *) echo "DarwinX64" diff --git a/src/test/groovy/sdkman/specs/PlatformSpec.groovy b/src/test/groovy/sdkman/specs/PlatformSpec.groovy index 31b98fa04..a483fc492 100644 --- a/src/test/groovy/sdkman/specs/PlatformSpec.groovy +++ b/src/test/groovy/sdkman/specs/PlatformSpec.groovy @@ -36,27 +36,8 @@ class PlatformSpec extends SdkmanEnvSpecification { "Linux" | "" | "exotic" "Darwin" | "x86_64" | "darwinx64" "Darwin" | "arm64" | "darwinarm64" - "Darwin" | "" | "darwinx64" - "MSYS64" | "i686" | "msys64" + "MSYS64" | "x86_64" | "msys64" "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") - } }