Merge branch 'eclipse-platform:master' into icon-disabling

Author: killingerm

.github/workflows/junit.yml

@@ -38,7 +38,7 @@ jobs:
            done
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
+        uses: EnricoMi/publish-unit-test-result-action@afb2984f4d89672b2f9d9c13ae23d53779671984 # v2.19.0
         id: test-results
         with:
           commit: ${{ github.event.workflow_run.head_sha }}

.github/workflows/maven.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: Event File
         path: ${{ github.event_path }}
@@ -54,7 +54,7 @@ jobs:
       run: |
         git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
     - name: Set up Java ${{ matrix.java }}
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'
@@ -92,7 +92,7 @@ jobs:
         integration-test
     - name: Upload Test Results for ${{ matrix.config.name }} / Java-${{ matrix.java }}
       if: always()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: test-results-${{ matrix.config.native }}-java${{ matrix.java }}
         if-no-files-found: warn

.github/workflows/pr-checks.yml

@@ -0,0 +1,21 @@
+# Fast running checks for pull-requests
+
+name: Pull-Request Checks
+concurrency: 
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  check-freeze-period:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master
+  check-merge-commits:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master
+  check-versions:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master
+    with:
+      botName: Eclipse Platform Bot
+      botMail: [email protected]

.github/workflows/verifyFreezePeriod.yml

@@ -0,0 +1,14 @@
+name: Publish Version Check Results
+
+on:
+  workflow_run:
+    workflows: [ 'Pull-Request Checks' ]
+    types: [ completed ]
+
+jobs:
+  publish-version-check-results:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master
+    with:
+      botGithubId: eclipse-platform-bot
+    secrets:
+      githubBotPAT: ${{ secrets.PLATFORM_BOT_PAT }}

.github/workflows/version-increments.yml

@@ -4,6 +4,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.10</version>
+		<version>4.0.12</version>
 	</extension>
 </extensions>

.mvn/extensions.xml

@@ -42,8 +42,8 @@ def runOnNativeBuildAgent(String platform, Closure body) {
 	}
 }
 
-/** Returns the download URL of the JDK against whoose C headers (in the 'include/' folder) and native libaries the SWT natives are compiled.*/
-def getNativeJdkUrl(String os, String arch){ // To update the used JDK version update the URL template below
+/** Returns the download URL of the JDK against whose C headers (in the 'include/' folder) and native libraries the SWT natives are compiled.*/
+def getNativeJdkUrl(String os, String arch) { // To update the used JDK version update the URL template below
 	if('win32'.equals(os) && 'aarch64'.equals(arch)) {
 		// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
 		dir("${WORKSPACE}/repackage-win32.aarch64-jdk") {
@@ -82,7 +82,7 @@ def getSWTVersions() { // must be called from the repository root
 	return props
 }
 
-boolean NATIVES_CHANGED = false
+def Set NATIVES_CHANGED = []
 
 pipeline {
 	options {
@@ -103,7 +103,9 @@ pipeline {
 		PR_VALIDATION_BUILD = "true"
 	}
 	parameters {
-		booleanParam(name: 'forceNativeBuilds', defaultValue: false, description: 'Forces to run the native builds of swt\'s binaries. Will push the built binaries to the master branch, unless \'skipCommit\' is set. Useful in debugging.')
+		booleanParam(name: 'forceNativeBuilds-cocoa', defaultValue: false, description: 'Enforce a re-build of SWT\'s native binaries for Mac OS X. Will push the built binaries to the master branch, unless \'skipCommit\' is set.')
+		booleanParam(name: 'forceNativeBuilds-gtk', defaultValue: false, description: 'Enforce a re-build of SWT\'s native binaries for Linux. Will push the built binaries to the master branch, unless \'skipCommit\' is set.')
+		booleanParam(name: 'forceNativeBuilds-win32', defaultValue: false, description: 'Enforce a re-build of SWT\'s native binaries for Windows. Will push the built binaries to the master branch, unless \'skipCommit\' is set.')
 		booleanParam(name: 'skipCommit', defaultValue: false, description: 'Stops committing to swt and swt binaries repo at the end. Useful in debugging.')
 	}
 	stages {
@@ -141,9 +143,10 @@ pipeline {
 						git config --global user.name 'Eclipse Releng Bot'
 					'''
 					script {
+						def allWS = ['cocoa', 'gtk', 'win32']
+						def libraryFilePattern = [ 'cocoa' : 'libswt-*.jnilib', 'gtk' : 'libswt-*.so', 'win32' : 'swt-*.dll' ]
 						def swtTag = getLatestGitTag()
 						echo "Current tag=${swtTag}."
-						boolean nativesChanged = false
 						dir('bundles/org.eclipse.swt') {
 							// Verify preprocessing is completed
 							sh '''
@@ -154,34 +157,42 @@ pipeline {
 							'''
 							def sourceFoldersProps = readProperties(file: 'nativeSourceFolders.properties')
 							def sources = sourceFoldersProps.collectEntries{ k, src -> [ k, src.split(',').collect{ f -> '\'' + f + '\''}.join(' ') ] }
-							def diff = sh(script: "git diff HEAD ${swtTag} ${sources.values().join(' ')}", returnStdout: true)
-							nativesChanged = !diff.strip().isEmpty()
-							echo "Natives changed since ${swtTag}: ${nativesChanged}"
+							for(ws in allWS) {
+								def diff = sh(script: "git diff HEAD ${swtTag} ${sources.src_common} ${sources['src_' + ws]}", returnStdout: true)
+								if (!diff.strip().isEmpty()) {
+									NATIVES_CHANGED += ws
+								}
+							}
+							echo "Natives changed since ${swtTag}: ${NATIVES_CHANGED.isEmpty() ? 'None': NATIVES_CHANGED}"
 						}
-						if (nativesChanged || params.forceNativeBuilds) {
-							NATIVES_CHANGED = true
-							def swtVersions = getSWTVersions()
-							withEnv(['swt_version='+swtVersions['swt_version'], 'new_version='+swtVersions['new_version'], 'rev='+swtVersions['rev'], 'new_rev='+swtVersions['new_rev'],
-									'comma_ver='+swtVersions['comma_ver'], "new_comma_ver=${swtVersions['maj_ver']},${swtVersions['min_ver']},${swtVersions['new_rev']},0" ]) {
-								sh '''
+						NATIVES_CHANGED += allWS.findAll{ ws -> params[ 'forceNativeBuilds-' + ws] }
+						if (!NATIVES_CHANGED.isEmpty()) {
+							def versions = getSWTVersions()
+								sh """
+									echo "Incrementing version from ${versions.swt_version} to ${versions.new_version}"
+									sed -i -e "s/REVISION = ${versions.rev}/REVISION = ${versions.new_rev}/g" \
+										'bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java'
+									sed -i -e "s/rev=${versions.rev}/rev=${versions.new_rev}/g" \
+										'bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak'
+								"""
+							for(ws in allWS) {
+								if (NATIVES_CHANGED.contains(ws)) {
+								sh """
 									# Delete native binaries to be replaced by subsequent binaries build
-									rm binaries/org.eclipse.swt.gtk.*/libswt-*.so
-									rm binaries/org.eclipse.swt.win32.*/swt-*.dll
-									rm binaries/org.eclipse.swt.cocoa.*/libswt-*.jnilib
-									
-									echo "Incrementing version from ${swt_version} to ${new_version}; new comma_ver=${new_comma_ver}"
-									
-									libraryFile='bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java'
-									sed -i -e "s/REVISION = ${rev}/REVISION = ${new_rev}/g" "$libraryFile"
-									
-									commonMakeFile='bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak'
-									sed -i -e "s/rev=${rev}/rev=${new_rev}/g" "$commonMakeFile"
-									sed -i -e "s/comma_ver=${comma_ver}/comma_ver=${new_comma_ver}/g" "$commonMakeFile"
-								'''
+									rm binaries/org.eclipse.swt.${ws}.*/${libraryFilePattern[ws]}
+								"""
+								} else {
+									// Just rename existing native library files to new revision instead of rebuilding them
+									sh """
+										for f in binaries/org.eclipse.swt.${ws}.*/${libraryFilePattern[ws]}; do
+											mv "\$f" "\$(echo \$f | sed 's/-${ws}-${versions.swt_version}/-${ws}-${versions.new_version}/g')"
+										done
+									"""
+								}
 							}
 							// Collect SWT-native's sources
 							dir('bundles/org.eclipse.swt') {
-								for (ws in ['cocoa', 'gtk', 'win32']) {
+								for (ws in NATIVES_CHANGED) {
 									sh "java -Dws=${ws} build-scripts/CollectSources.java -nativeSources 'target/natives-build-temp/${ws}'"
 									dir("target/natives-build-temp/${ws}") {
 										stash(name:"swt.binaries.sources.${ws}")
@@ -213,29 +224,35 @@ pipeline {
 						'win32.win32.x86_64'
 					}
 				}
+				when {
+					expression {
+						def (ws, os, arch) = env.PLATFORM.split('\\.')
+						return NATIVES_CHANGED.any{ w -> ws.startsWith(w)} // handle also dedicated gtk4 build
+					}
+				}
 				stages {
-					stage('Build SWT-natives') {
+					stage('Initiate native build') {
 						options {
 							timeout(time: 120, unit: 'MINUTES') // Some build agents are rare and it might take awhile until they are available.
 						}
 						steps {
 							script {
 								def (ws, os, arch) = env.PLATFORM.split('\\.')
-								dir("jdk-download-${os}.${arch}") {
-									// Fetch the JDK, which provides the C header-files and shared native libaries, against which the natives are build.
+								dir("jdk-download-${ws}.${arch}") {
+									// Fetch the JDK, which provides the C header-files and shared native libraries, against which the natives are build.
 									sh "curl ${getNativeJdkUrl(os, arch)} | tar -xzf - include/ lib/"
-									stash name:"jdk.resources.${os}.${arch}", includes: "include/,lib/"
+									stash name:"jdk.resources.${ws}.${arch}", includes: "include/,lib/"
 									deleteDir()
 								}
 								runOnNativeBuildAgent("${PLATFORM}") {
 									cleanWs() // Workspace is not cleaned up by default, so we do it explicitly
 									echo "OS: ${os}, ARCH: ${arch}"
 									unstash "swt.binaries.sources.${ws == 'gtk4' ? 'gtk' : ws }"
 									dir('jdk.resources') {
-										unstash "jdk.resources.${os}.${arch}"
+										unstash "jdk.resources.${ws}.${arch}"
 									}
 									withEnv(['MODEL=' + arch, "OUTPUT_DIR=${WORKSPACE}/libs", "SWT_JAVA_HOME=${WORKSPACE}/jdk.resources"]) {
-										if (isUnix()){
+										if (isUnix()) {
 											sh '''#!/bin/bash -x
 												mkdir libs
 												if [[ ${PLATFORM} == gtk.linux.* ]]; then
@@ -344,12 +361,16 @@ pipeline {
 			}
 			post {
 				always {
-					junit 'eclipse.platform.swt/tests/*.test*/target/surefire-reports/*.xml'
-					archiveArtifacts artifacts: '**/*.log,*/binaries/*/target/*.jar', excludes: '**/*-sources.jar'
+					junit allowEmptyResults: true, testResults: 'eclipse.platform.swt/tests/*.test*/target/surefire-reports/*.xml'
+					archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log,*/binaries/*/target/*.jar', excludes: '**/*-sources.jar'
 					discoverGitReferenceBuild referenceJob: 'eclipse.platform.swt/master'
 					// To accept unstable builds (test errors or new warnings introduced by third party changes) as reference using "ignoreQualityGate:true"
-					recordIssues publishAllIssues: true, ignoreQualityGate:true, tools: [eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
-					recordIssues publishAllIssues: true, ignoreQualityGate:true, tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: true]]
+					recordIssues enabledForFailure: true, publishAllIssues: true, ignoreQualityGate: true, tools: [
+							eclipse(name: 'Compiler', pattern: '**/target/compilelogs/*.xml'),
+							issues(name: 'API Tools', id: 'apitools', pattern: '**/target/apianalysis/*.xml'),
+							javaDoc()
+						], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
+					recordIssues enabledForFailure: true, publishAllIssues: true, ignoreQualityGate:true, tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: true]]
 				}
 			}
 		}

Jenkinsfile

@@ -1,4 +1,7 @@
-[![SWT Matrix Build](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml/badge.svg)](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml) ![SWT Matrix Tests](https://gist.githubusercontent.com/eclipse-releng-bot/78d110a601baa4ef777ccb472f584038/raw/71510599eb84e852f3e135aa7a3ddf33854ca716/badge.svg)
+[![SWT Matrix Build](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml/badge.svg)](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml)
+[![Publish Unit Test Results](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/junit.yml/badge.svg)](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/junit.yml)
+![SWT Matrix Tests](https://gist.githubusercontent.com/eclipse-releng-bot/78d110a601baa4ef777ccb472f584038/raw/71510599eb84e852f3e135aa7a3ddf33854ca716/badge.svg)
+[![License](https://img.shields.io/github/license/eclipse-platform/eclipse.platform)](https://github.com/eclipse-platform/eclipse.platform.swt/blob/master/LICENSE)
 
 # About
 
@@ -122,7 +125,7 @@ SWT used to track ongoing development and issues in Bugzilla .
 
 ## Create a New Bug
 
-You can register bugs and feature requests in the Github Issue Tracker. Remember that contributions are always welcome!
+You can register bugs and feature requests in the GitHub Issue Tracker. Remember that contributions are always welcome!
 - [View existing SWT issues](https://github.com/eclipse-platform/eclipse.platform.swt/issues)
 - [New SWT issue](https://github.com/eclipse-platform/eclipse.platform.swt/issues/new)
 

README.md

@@ -231,6 +231,14 @@
                 <message_argument value="VerifyKeyListener"/>
             </message_arguments>
         </filter>
+    </resource>
+	<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageGcDrawer.java" type="org.eclipse.swt.graphics.ImageGcDrawer">
+        <filter id="404000815">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.graphics.ImageGcDrawer"/>
+                <message_argument value="getGcStyle()"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java" type="org.eclipse.swt.dnd.DragSourceListener">
         <filter id="576720909">
@@ -463,12 +471,18 @@
                 <message_argument value="IE"/>
             </message_arguments>
         </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.swt.SWT"/>
+                <message_argument value="NO_SEARCH"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
             <message_arguments>
+                <message_argument value="3.130.0"/>
                 <message_argument value="3.129.0"/>
-                <message_argument value="3.128.0"/>
             </message_arguments>
         </filter>
     </resource>

binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters

@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
 Bundle-Name: %fragmentName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.aarch64; singleton:=true
-Bundle-Version: 3.129.0.qualifier
+Bundle-Version: 3.130.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: