From f29b183d79258781231fce367503e4e2b19e69a8 Mon Sep 17 00:00:00 2001 From: Josh Tilles Date: Fri, 20 Oct 2023 02:44:49 -0400 Subject: [PATCH 1/2] oracle-jdk-javadoc: fix installation target Oracle seems to have ceased including the minor and patch numbers in the installed directory name, starting with JDK 19. --- Casks/o/oracle-jdk-javadoc.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Casks/o/oracle-jdk-javadoc.rb b/Casks/o/oracle-jdk-javadoc.rb index 972fac2096..a24935f48f 100644 --- a/Casks/o/oracle-jdk-javadoc.rb +++ b/Casks/o/oracle-jdk-javadoc.rb @@ -18,9 +18,9 @@ cask "oracle-jdk-javadoc" do end end - artifact "docs", target: "/Library/Java/JavaVirtualMachines/jdk-#{version.csv.first}.jdk/Contents/Home/docs" + artifact "docs", target: "/Library/Java/JavaVirtualMachines/jdk-#{version.major}.jdk/Contents/Home/docs" - uninstall rmdir: "/Library/Java/JavaVirtualMachines/jdk-#{version.csv.first}.jdk" + uninstall rmdir: "/Library/Java/JavaVirtualMachines/jdk-#{version.major}.jdk" # No zap stanza required From 2a01c6a145f186a46413105b8e28a63d545e448c Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Fri, 20 Oct 2023 15:27:12 +0800 Subject: [PATCH 2/2] Update oracle-jdk-javadoc.rb --- Casks/o/oracle-jdk-javadoc.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Casks/o/oracle-jdk-javadoc.rb b/Casks/o/oracle-jdk-javadoc.rb index a24935f48f..da51cc7bb7 100644 --- a/Casks/o/oracle-jdk-javadoc.rb +++ b/Casks/o/oracle-jdk-javadoc.rb @@ -1,6 +1,6 @@ cask "oracle-jdk-javadoc" do - version "20.0.2,9,6e380f22cbe7469fa75fb448bd903d8e" - sha256 "7d41ca5845dd71d20ae95968773bed4c1f652880d11048aef1f482e7b69cfc8c" + version "21.0.1,12,415e3f918a1f4062a0074a2794853d0d" + sha256 "ef02d2707c1e2a24dc8de84e6252f5f6563c569f4e41999718956561e229f477" url "https://download.oracle.com/otn_software/java/jdk/#{version.csv.first}+#{version.csv.second}/#{version.csv.third}/jdk-#{version.csv.first}_doc-all.zip", cookies: {