Update to JDK 18+36

6 files changed, 40 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd780b8b3c4c..1cf23b2927ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jdk-temurin
-	pkgdesc = Temurin (OpenJDK 17 Java binaries by Adoptium, formerly AdoptOpenJDK)
-	pkgver = 17.0.2.u8
+	pkgdesc = Temurin (OpenJDK 18 Java binaries by Adoptium, formerly AdoptOpenJDK)
+	pkgver = 18.u36
 	pkgrel = 1
 	url = https://adoptium.net/
 	install = install_jdk-temurin.sh
@@ -15,20 +15,20 @@ pkgbase = jdk-temurin
 	depends = alsa-lib
 	optdepends = gtk2: for the Gtk+ 2 look and feel
 	optdepends = gtk3: for the Gtk+ 3 look and feel
-	provides = java-runtime-headless=17
-	provides = java-runtime-headless-openjdk=17
-	provides = jre17-openjdk-headless=17.0.2.u8
-	provides = jre-openjdk-headless=17.0.2.u8
-	provides = java-runtime=17
-	provides = java-runtime-openjdk=17
-	provides = jre17-openjdk=17.0.2.u8
-	provides = jre-openjdk=17.0.2.u8
-	provides = java-environment=17
-	provides = java-environment-openjdk=17
-	provides = jdk17-openjdk=17.0.2.u8
-	provides = jdk-openjdk=17.0.2.u8
-	provides = openjdk17-src=17.0.2.u8
-	provides = openjdk-src=17.0.2.u8
+	provides = java-runtime-headless=18
+	provides = java-runtime-headless-openjdk=18
+	provides = jre18-openjdk-headless=18.u36
+	provides = jre-openjdk-headless=18.u36
+	provides = java-runtime=18
+	provides = java-runtime-openjdk=18
+	provides = jre18-openjdk=18.u36
+	provides = jre-openjdk=18.u36
+	provides = java-environment=18
+	provides = java-environment-openjdk=18
+	provides = jdk18-openjdk=18.u36
+	provides = jdk-openjdk=18.u36
+	provides = openjdk18-src=18.u36
+	provides = openjdk-src=18.u36
 	replaces = jdk-adoptopenjdk
 	backup = etc/java-temurin/logging.properties
 	backup = etc/java-temurin/management/jmxremote.access
@@ -45,13 +45,13 @@ pkgbase = jdk-temurin
 	backup = etc/java-temurin/security/policy/unlimited/default_local.policy
 	backup = etc/java-temurin/security/policy/unlimited/default_US_export.policy
 	backup = etc/java-temurin/sound.properties
-	source = https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz
+	source = https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18%2B36/OpenJDK18U-jdk_x64_linux_hotspot_18_36.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
-	sha256sums = 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48
-	sha256sums = ae076317d93a389cc0c893fd9ec6769ae860c2cc01f8c8bed3f4ee476c73e625
-	sha256sums = dc278160ca7df32bcfab0a5420c09eaf6f4602d30f57b6c5bedb0f60062c5228
-	sha256sums = d0913ae3b9f469f8567432b0867222d66f50008c313f5a0882d15994ba19ec01
+	sha256sums = 82d67983f92f16b5fb57176fa4c228e44ecc6f671b3c3523140fba7fb904dceb
+	sha256sums = ea75ce65e1393a91fcb83beed3b84759a88bbe9df1ab4efa440062bbd2fe6c1f
+	sha256sums = 36b2ff191c81ce5eef9e1eed2acc54dba78b2bcdf47532607f0cc9302503a265
+	sha256sums = b73453a639017037627d926cf2179d1c7e296d9c0804747848d1c799ca38652c
 
 pkgname = jdk-temurin
diff --git a/PKGBUILD b/PKGBUILD
index 55bb2ba94be8..acb3ebdf8a27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,14 @@
 # This PKGBUILD is maintained on github:
 # https://github.com/michaellass/AUR
 
-_majorver=17
-_completever=17.0.2
-_updatever=8
+_majorver=18
+_completever=18
+_updatever=36
 pkgrel=1
 pkgver=${_completever}.u${_updatever}
 _tag_ver=${_completever}+${_updatever}
-[ $_majorver != $_completever ] && _versuffix=U
+#[ $_majorver != $_completever ] && _versuffix=U
+_versuffix=U
 
 pkgname=jdk-temurin
 pkgdesc="Temurin (OpenJDK ${_majorver} Java binaries by Adoptium, formerly AdoptOpenJDK)"
@@ -60,10 +61,10 @@ source=(https://github.com/adoptium/temurin${_majorver}-binaries/releases/downlo
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
-sha256sums=('288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48'
-            'ae076317d93a389cc0c893fd9ec6769ae860c2cc01f8c8bed3f4ee476c73e625'
-            'dc278160ca7df32bcfab0a5420c09eaf6f4602d30f57b6c5bedb0f60062c5228'
-            'd0913ae3b9f469f8567432b0867222d66f50008c313f5a0882d15994ba19ec01')
+sha256sums=('82d67983f92f16b5fb57176fa4c228e44ecc6f671b3c3523140fba7fb904dceb'
+            'ea75ce65e1393a91fcb83beed3b84759a88bbe9df1ab4efa440062bbd2fe6c1f'
+            '36b2ff191c81ce5eef9e1eed2acc54dba78b2bcdf47532607f0cc9302503a265'
+            'b73453a639017037627d926cf2179d1c7e296d9c0804747848d1c799ca38652c')
 
 _jvmdir=/usr/lib/jvm/java-${_majorver}-temurin
 _jdkdir=jdk-${_tag_ver}
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
index bb51d39c9c9d..19174db96002 100644
--- a/freedesktop-java.desktop
+++ b/freedesktop-java.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Temurin Java 17 Runtime
-Comment=Temurin Java 17 Runtime
+Name=Temurin Java 18 Runtime
+Comment=Temurin Java 18 Runtime
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-17-temurin/bin/java -jar
+Exec=/usr/lib/jvm/java-18-temurin/bin/java -jar
 Terminal=false
 Type=Application
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
index f6ba423e460e..ee1b8cbd3ea3 100644
--- a/freedesktop-jconsole.desktop
+++ b/freedesktop-jconsole.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Temurin Java 17 Console
-Comment=Temurin Java 17 Monitoring & Management Console
+Name=Temurin Java 18 Console
+Comment=Temurin Java 18 Monitoring & Management Console
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-17-temurin/bin/jconsole
+Exec=/usr/lib/jvm/java-18-temurin/bin/jconsole
 Terminal=false
 Type=Application
 Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
index dd7febc449de..2de897c65768 100644
--- a/freedesktop-jshell.desktop
+++ b/freedesktop-jshell.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Temurin Java 17 Shell
-Comment=Temurin Java 17 Shell
+Name=Temurin Java 18 Shell
+Comment=Temurin Java 18 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-17-temurin/bin/jshell
+Exec=/usr/lib/jvm/java-18-temurin/bin/jshell
 Terminal=true
 Type=Application
 Categories=Application;System;
diff --git a/install_jdk-temurin.sh b/install_jdk-temurin.sh
index 0fa20575bf78..e16c1a25f185 100644
--- a/install_jdk-temurin.sh
+++ b/install_jdk-temurin.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-17-temurin'
+THIS_JDK='java-18-temurin'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then