Skip to content

Commit 9898d66

Browse files
authored
Merge branch 'eclipse-platform:master' into master
2 parents 8026642 + a9a3a05 commit 9898d66

164 files changed

Lines changed: 1182 additions & 877 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
integration-test
136136
- name: Upload Test Results
137137
if: always()
138-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
138+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
139139
with:
140140
name: test-results-${{ inputs.native }}-${{ inputs.gtk }}-${{ inputs.gdk_backend }}-java${{ inputs.java }}
141141
if-no-files-found: warn

.github/workflows/junit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
done
119119
120120
- name: Publish Unit Test Results
121-
uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.0
121+
uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2.23.0
122122
id: test-results
123123
with:
124124
check_name: ${{ matrix.platform == 'all' && 'Test Results' || format('Test Results ({0})', matrix.platform) }}

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Upload
29-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
29+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3030
with:
3131
name: Event File
3232
path: ${{ github.event_path }}

.github/workflows/pr-checks.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,23 @@ jobs:
1919
with:
2020
botName: Eclipse Platform Bot
2121
botMail: platform-bot@eclipse.org
22+
23+
check-javadoc-consistency:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v5.0.0
27+
- uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190 # v5.0.0
28+
with:
29+
java-version: 25
30+
distribution: 'temurin'
31+
cache: maven
32+
- name: Run JavaDoc basher
33+
run: >
34+
mvn --non-recursive --batch-mode --no-transfer-progress
35+
-Pjavadoc-basher exec:exec@run-javadoc-basher
36+
- name: Verify no changes
37+
run: |
38+
if ! git diff --exit-code ; then
39+
echo "::error title=Inconsistent JavaDoc::JavaDoc-Basher discovered JavaDoc inconsistencies between implementations, which must be resolved."
40+
exit 1
41+
fi

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,41 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11-
<resource path="Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataAtSizeProvider.java" type="org.eclipse.swt.graphics.ImageDataAtSizeProvider">
12-
<filter id="403804204" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
11+
<resource path="Eclipse SWT Printing/common/org/eclipse/swt/printing/PageSize.java" type="org.eclipse.swt.printing.PageSize">
12+
<filter id="338944126">
13+
<message_arguments>
14+
<message_argument value="org.eclipse.swt.printing.PageSize"/>
15+
<message_argument value="equals(Object)"/>
16+
</message_arguments>
17+
</filter>
18+
<filter id="338944126">
19+
<message_arguments>
20+
<message_argument value="org.eclipse.swt.printing.PageSize"/>
21+
<message_argument value="hashCode()"/>
22+
</message_arguments>
23+
</filter>
24+
<filter id="338944126">
1325
<message_arguments>
14-
<message_argument value="org.eclipse.swt.graphics.ImageDataAtSizeProvider"/>
15-
<message_argument value="getDefaultSize()"/>
26+
<message_argument value="org.eclipse.swt.printing.PageSize"/>
27+
<message_argument value="height()"/>
1628
</message_arguments>
1729
</filter>
18-
<filter id="1211105284" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
30+
<filter id="338944126">
1931
<message_arguments>
20-
<message_argument value="getDefaultSize()"/>
32+
<message_argument value="org.eclipse.swt.printing.PageSize"/>
33+
<message_argument value="toString()"/>
2134
</message_arguments>
2235
</filter>
23-
<filter id="403804204" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
36+
<filter id="338944126">
2437
<message_arguments>
25-
<message_argument value="org.eclipse.swt.graphics.ImageDataAtSizeProvider"/>
26-
<message_argument value="getImageData(int, int)"/>
38+
<message_argument value="org.eclipse.swt.printing.PageSize"/>
39+
<message_argument value="width()"/>
2740
</message_arguments>
2841
</filter>
29-
<filter id="1211105284" comment="Adding API filter to mark ImageDataAtSizeProvider as referenceable">
42+
<filter id="338948223">
3043
<message_arguments>
31-
<message_argument value="getImageData(int, int)"/>
44+
<message_argument value="org.eclipse.swt.printing.PageSize"/>
45+
<message_argument value="PageSize(double, double)"/>
3246
</message_arguments>
3347
</filter>
3448
</resource>

binaries/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.aarch64; singleton:=true
6-
Bundle-Version: 3.133.0.qualifier
6+
Bundle-Version: 3.133.100.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4972r6.jnilib

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:08de5a9406006c961aebe757993e2d65e543f84f6d375f0f3dd85563adaf38b6
3+
size 51952

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4972r6.jnilib

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:3c8f6a2ed27c1b462c8efe33af3e70e23ab259f598f7a9ca41b7023c52973ebd
3+
size 576624

0 commit comments

Comments
 (0)