Skip to content

Commit 3ea1db3

Browse files
jonahgrahamakurtakov
jonahgraham
authored and
akurtakov
committed
Update BREE to Java21 for SWT
1 parent 77f9654 commit 3ea1db3

File tree

42 files changed

+60
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+60
-58
lines changed

‎Jenkinsfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
4848
// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
4949
dir("${WORKSPACE}/repackage-win32.aarch64-jdk") {
5050
sh """
51-
curl -L 'https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2024-02-07-14-14-beta/OpenJDK17U-jdk_aarch64_windows_hotspot_2024-02-07-14-14.zip' > jdk.zip
52-
unzip -q jdk.zip jdk-17.0.11+1/include/** jdk-17.0.11+1/lib/**
53-
cd jdk-17.0.11+1
51+
curl -L 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_aarch64_windows_hotspot_21.0.9_10.zip' > jdk.zip
52+
unzip -q jdk.zip jdk-21.0.9+10/include/** jdk-21.0.9+10/lib/**
53+
cd jdk-21.0.9+10
5454
tar -czf ../jdk.tar.gz include/ lib/
5555
"""
5656
}
@@ -59,15 +59,15 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
5959
// Downloading jdk and renew it for riscv64 architecture on Linux
6060
dir("${WORKSPACE}/repackage-linux.riscv64-jdk") {
6161
sh """
62-
curl -L 'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz' > jdk.tar.gz
63-
tar -xzf jdk.tar.gz jdk-17.0.12+7/include/ jdk-17.0.12+7/lib/
64-
cd jdk-17.0.12+7
62+
curl -L 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.9_10.tar.gz' > jdk.tar.gz
63+
tar -xzf jdk.tar.gz jdk-21.0.9+10/include/ jdk-21.0.9+10/lib/
64+
cd jdk-21.0.9+10
6565
tar -czf ../jdk.tar.gz include/ lib/
6666
"""
6767
}
6868
return "file://${WORKSPACE}/repackage-linux.riscv64-jdk/jdk.tar.gz"
6969
}
70-
return "https://download.eclipse.org/justj/jres/17/downloads/20230428_1804/org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-17.0.7-${os}-${arch}.tar.gz"
70+
return "https://download.eclipse.org/justj/jres/21/downloads/20251104_1502/org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-21.0.9-${os}-${arch}.tar.gz"
7171
}
7272

7373
def getLatestGitTag() {

‎binaries/.classpath_cocoa‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="src" path="Eclipse SWT/cocoa"/>
55
<classpathentry kind="src" path="Eclipse SWT/common"/>
66
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>

‎binaries/.classpath_gtk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="src" path="Eclipse SWT/gtk"/>
55
<classpathentry kind="src" path="Eclipse SWT/cairo"/>
66
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>

‎binaries/.classpath_win32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="src" path="Eclipse SWT/win32"/>
55
<classpathentry kind="src" path="Eclipse SWT/common"/>
66
<classpathentry kind="src" path="Eclipse SWT PI/common"/>

‎binaries/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1111
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1212
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1313
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
14-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
14+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1515
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
16-
org.eclipse.jdt.core.compiler.compliance=17
16+
org.eclipse.jdt.core.compiler.compliance=21
1717
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1818
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1919
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -129,4 +129,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
129129
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
130130
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
131131
org.eclipse.jdt.core.compiler.release=enabled
132-
org.eclipse.jdt.core.compiler.source=17
132+
org.eclipse.jdt.core.compiler.source=21

‎binaries/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<properties>
2929
<buildid>${buildId}</buildid>
30-
<maven.compiler.release>17</maven.compiler.release>
30+
<maven.compiler.release>21</maven.compiler.release>
3131
<swtMainProject>${project.basedir}/../../bundles/org.eclipse.swt</swtMainProject>
3232
</properties>
3333

‎bundles/org.eclipse.swt.svg/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="src" path="resources"/>

‎bundles/org.eclipse.swt.svg/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
3-
org.eclipse.jdt.core.compiler.compliance=17
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
3+
org.eclipse.jdt.core.compiler.compliance=21
44
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
55
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
77
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
88
org.eclipse.jdt.core.compiler.release=enabled
9-
org.eclipse.jdt.core.compiler.source=17
9+
org.eclipse.jdt.core.compiler.source=21
1010
org.eclipse.jdt.core.incompleteClasspath=warning

‎bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Automatic-Module-Name: org.eclipse.swt.svg
66
Bundle-Name: %fragmentName
77
Bundle-Vendor: %providerName
88
Bundle-Localization: fragment
9-
Bundle-RequiredExecutionEnvironment: JavaSE-17
9+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1010
Fragment-Host: org.eclipse.swt
1111
Import-Package: com.github.weisj.jsvg;version="[2.0.0,3.0.0)",
1212
com.github.weisj.jsvg.parser;version="[2.0.0,3.0.0)",

‎bundles/org.eclipse.swt.tools/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="src" path="JNI Generation"/>

0 commit comments

Comments
 (0)