Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync delivery to master after 23-rc2 #7630

Merged
merged 16 commits into from
Aug 7, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update FlatLaf from 3.5 to 3.5.1
mbien committed Aug 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 0c15d654a8f3d8bfc1a0e1e0c57e303063ccb42c
2 changes: 1 addition & 1 deletion platform/libs.flatlaf/external/binaries-list
Original file line number Diff line number Diff line change
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

5BA0BA8CA4A1942BFFF4A2771565F125C07A56A6 com.formdev:flatlaf:3.5
8E4295F9BA5756736FA60A3A567FD9CD8840594F com.formdev:flatlaf:3.5.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: FlatLaf Look and Feel
Description: FlatLaf Look and Feel
Version: 3.5
Files: flatlaf-3.5.jar
Version: 3.5.1
Files: flatlaf-3.5.1.jar
License: Apache-2.0
Origin: FormDev Software GmbH.
URL: https://www.formdev.com/flatlaf/
2 changes: 1 addition & 1 deletion platform/libs.flatlaf/manifest.mf
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ OpenIDE-Module: org.netbeans.libs.flatlaf/1
OpenIDE-Module-Install: org/netbeans/libs/flatlaf/Installer.class
OpenIDE-Module-Specification-Version: 1.19
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Implementation-Version: 3.5
OpenIDE-Module-Implementation-Version: 3.5.1
14 changes: 7 additions & 7 deletions platform/libs.flatlaf/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -31,17 +31,17 @@ spec.version.base.fatal.warning=false
#
# So when FlatLaf is updated, the OpenIDE-Module-Implementation-Version entry
# in manifest.mf needs to be updated to match the new FlatLaf version.
release.external/flatlaf-3.5.jar=modules/ext/flatlaf-3.5.jar
release.external/flatlaf-3.5.1.jar=modules/ext/flatlaf-3.5.1.jar
# com.formdev.flatlaf.ui intentionally ommitted.
# rest is equivalent to the "public" packages for friend dependencies as declared in project.xml
sigtest.public.packages=com.formdev.flatlaf,com.formdev.flatlaf.themes,com.formdev.flatlaf.util

release.external/flatlaf-3.5.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll=modules/lib/flatlaf-windows-x86.dll
release.external/flatlaf-3.5.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll=modules/lib/flatlaf-windows-x86_64.dll
release.external/flatlaf-3.5.jar!/com/formdev/flatlaf/natives/flatlaf-windows-arm64.dll=modules/lib/flatlaf-windows-arm64.dll
release.external/flatlaf-3.5.jar!/com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib=modules/lib/libflatlaf-macos-arm64.dylib
release.external/flatlaf-3.5.jar!/com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib=modules/lib/libflatlaf-macos-x86_64.dylib
release.external/flatlaf-3.5.jar!/com/formdev/flatlaf/natives/libflatlaf-linux-x86_64.so=modules/lib/libflatlaf-linux-x86_64.so
release.external/flatlaf-3.5.1.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll=modules/lib/flatlaf-windows-x86.dll
release.external/flatlaf-3.5.1.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll=modules/lib/flatlaf-windows-x86_64.dll
release.external/flatlaf-3.5.1.jar!/com/formdev/flatlaf/natives/flatlaf-windows-arm64.dll=modules/lib/flatlaf-windows-arm64.dll
release.external/flatlaf-3.5.1.jar!/com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib=modules/lib/libflatlaf-macos-arm64.dylib
release.external/flatlaf-3.5.1.jar!/com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib=modules/lib/libflatlaf-macos-x86_64.dylib
release.external/flatlaf-3.5.1.jar!/com/formdev/flatlaf/natives/libflatlaf-linux-x86_64.so=modules/lib/libflatlaf-linux-x86_64.so
jnlp.verify.excludes=\
modules/lib/flatlaf-windows-x86.dll,\
modules/lib/flatlaf-windows-x86_64.dll,\
4 changes: 2 additions & 2 deletions platform/libs.flatlaf/nbproject/project.xml
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@
<package>com.formdev.flatlaf.util</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/flatlaf-3.5.jar</runtime-relative-path>
<binary-origin>external/flatlaf-3.5.jar</binary-origin>
<runtime-relative-path>ext/flatlaf-3.5.1.jar</runtime-relative-path>
<binary-origin>external/flatlaf-3.5.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>