Merge pull request #178 from unoplatform/openjdk-macos-arm64

fix(openjdk): Use manifest, not code, to download arm64 installers
unoplatform · Oct 4, 2023 · 7889f0c · 7889f0c
2 parents d29ffaf + 90894f1
commit 7889f0c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/UnoCheck/Checkups/OpenJdkCheckup.cs b/UnoCheck/Checkups/OpenJdkCheckup.cs
@@ -98,9 +98,6 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 				return Task.FromResult(DiagnosticResult.Ok(this));
 
 			var url = Manifest?.Check?.OpenJdk?.Url;
-			if (url is not null && RuntimeInformation.OSArchitecture == Architecture.Arm64) {
-				url = new (url.ToString().Replace("-x64.", "-aarch64."));
-			}
 			return Task.FromResult(new DiagnosticResult(Status.Error, this,
 				new Suggestion("Install OpenJDK11",
 					new BootsSolution(url, "Download and Install Microsoft OpenJDK 11"))));

diff --git a/manifests/uno.ui-preview-major.manifest.json b/manifests/uno.ui-preview-major.manifest.json
@@ -2,7 +2,7 @@
   "check": {
     "toolVersion": "1.14.0",
     "variables": {
-      "OPENJDK_VERSION": "11.0.16",
+      "OPENJDK_VERSION": "11.0.20.1",
       "DOTNET_SDK_VERSION": "8.0.100-rc.1.23455.8",
       "MACCATALYST_SDK_VERSION": "16.4.8825-net8-rc1/8.0.100-rc.1",
       "IOS_SDK_VERSION": "16.4.8825-net8-rc1/8.0.100-rc.1",
@@ -16,7 +16,9 @@
       "version": "11.0",
       "urls": {
         "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi",
-        "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg"
+        "winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch64.msi",
+        "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg",
+        "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg"
       }
     },
     "xcode": {

diff --git a/manifests/uno.ui-preview.manifest.json b/manifests/uno.ui-preview.manifest.json
@@ -2,7 +2,7 @@
   "check": {
     "toolVersion": "1.5.0",
     "variables": {
-      "OPENJDK_VERSION": "11.0.16",
+      "OPENJDK_VERSION": "11.0.20.1",
       "DOTNET_SDK_VERSION": "7.0.401",
       "MACCATALYST_SDK_VERSION": "16.4.7054/7.0.100",
       "IOS_SDK_VERSION": "16.4.7054/7.0.100",
@@ -16,7 +16,9 @@
       "version": "11.0",
       "urls": {
         "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi",
-        "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg"
+        "winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch64.msi",
+        "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg",
+        "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg"
       }
     },
     "xcode": {

diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json
@@ -2,7 +2,7 @@
   "check": {
     "toolVersion": "1.5.0",
     "variables": {
-      "OPENJDK_VERSION": "11.0.16",
+      "OPENJDK_VERSION": "11.0.20.1",
       "DOTNET_SDK_VERSION": "7.0.401",
       "MACCATALYST_SDK_VERSION": "16.4.7054/7.0.100",
       "IOS_SDK_VERSION": "16.4.7054/7.0.100",
@@ -16,7 +16,9 @@
       "version": "11.0",
       "urls": {
         "win64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi",
-        "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg"
+        "winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch64.msi",
+        "osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg",
+        "osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg"
       }
     },
     "xcode": {