This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new a7776b4bca Update FlatLaf from 2.5 to 2.6 new c926afc437 Merge pull request #4811 from DevCharly/flatlaf-2.6 a7776b4bca is described below commit a7776b4bca392e40c3bb86ccb4bdfd4af751615b Author: Karl Tauber <k...@jformdesigner.com> AuthorDate: Tue Oct 18 12:35:41 2022 +0200 Update FlatLaf from 2.5 to 2.6 --- platform/libs.flatlaf/external/binaries-list | 2 +- .../external/{flatlaf-2.5-license.txt => flatlaf-2.6-license.txt} | 4 ++-- platform/libs.flatlaf/manifest.mf | 2 +- platform/libs.flatlaf/nbproject/project.properties | 8 ++++---- platform/libs.flatlaf/nbproject/project.xml | 4 ++-- .../libs.flatlaf/src/org/netbeans/libs/flatlaf/Installer.java | 5 +---- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/platform/libs.flatlaf/external/binaries-list b/platform/libs.flatlaf/external/binaries-list index 407d5e7b29..b51d5449fe 100644 --- a/platform/libs.flatlaf/external/binaries-list +++ b/platform/libs.flatlaf/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -53B5104BDF92CBC7A650E075ED7296DD0AB77CF3 com.formdev:flatlaf:2.5 +4DD2BA228E3C57EB3D80E3927B5A6A33265EB69B com.formdev:flatlaf:2.6 diff --git a/platform/libs.flatlaf/external/flatlaf-2.5-license.txt b/platform/libs.flatlaf/external/flatlaf-2.6-license.txt similarity index 99% rename from platform/libs.flatlaf/external/flatlaf-2.5-license.txt rename to platform/libs.flatlaf/external/flatlaf-2.6-license.txt index 21f8ba55ee..1ea20258dd 100644 --- a/platform/libs.flatlaf/external/flatlaf-2.5-license.txt +++ b/platform/libs.flatlaf/external/flatlaf-2.6-license.txt @@ -1,7 +1,7 @@ Name: FlatLaf Look and Feel Description: FlatLaf Look and Feel -Version: 2.5 -Files: flatlaf-2.5.jar +Version: 2.6 +Files: flatlaf-2.6.jar License: Apache-2.0 Origin: FormDev Software GmbH. URL: https://www.formdev.com/flatlaf/ diff --git a/platform/libs.flatlaf/manifest.mf b/platform/libs.flatlaf/manifest.mf index 4b3fbf373f..0dea2bbb8a 100644 --- a/platform/libs.flatlaf/manifest.mf +++ b/platform/libs.flatlaf/manifest.mf @@ -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.12 AutoUpdate-Show-In-Client: false -OpenIDE-Module-Implementation-Version: 2.5 +OpenIDE-Module-Implementation-Version: 2.6 diff --git a/platform/libs.flatlaf/nbproject/project.properties b/platform/libs.flatlaf/nbproject/project.properties index f9acccb296..7991fef7e1 100644 --- a/platform/libs.flatlaf/nbproject/project.properties +++ b/platform/libs.flatlaf/nbproject/project.properties @@ -31,11 +31,11 @@ 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-2.5.jar=modules/ext/flatlaf-2.5.jar +release.external/flatlaf-2.6.jar=modules/ext/flatlaf-2.6.jar -release.external/flatlaf-2.5.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll=modules/lib/flatlaf-windows-x86.dll -release.external/flatlaf-2.5.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll=modules/lib/flatlaf-windows-x86_64.dll -release.external/flatlaf-2.5.jar!/com/formdev/flatlaf/natives/libflatlaf-linux-x86_64.so=modules/lib/libflatlaf-linux-x86_64.so +release.external/flatlaf-2.6.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll=modules/lib/flatlaf-windows-x86.dll +release.external/flatlaf-2.6.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll=modules/lib/flatlaf-windows-x86_64.dll +release.external/flatlaf-2.6.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,\ diff --git a/platform/libs.flatlaf/nbproject/project.xml b/platform/libs.flatlaf/nbproject/project.xml index 915df94e64..95e90a3eab 100644 --- a/platform/libs.flatlaf/nbproject/project.xml +++ b/platform/libs.flatlaf/nbproject/project.xml @@ -47,8 +47,8 @@ <package>com.formdev.flatlaf.util</package> </public-packages> <class-path-extension> - <runtime-relative-path>ext/flatlaf-2.5.jar</runtime-relative-path> - <binary-origin>external/flatlaf-2.5.jar</binary-origin> + <runtime-relative-path>ext/flatlaf-2.6.jar</runtime-relative-path> + <binary-origin>external/flatlaf-2.6.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/platform/libs.flatlaf/src/org/netbeans/libs/flatlaf/Installer.java b/platform/libs.flatlaf/src/org/netbeans/libs/flatlaf/Installer.java index 4c8daad464..a208518183 100644 --- a/platform/libs.flatlaf/src/org/netbeans/libs/flatlaf/Installer.java +++ b/platform/libs.flatlaf/src/org/netbeans/libs/flatlaf/Installer.java @@ -19,8 +19,6 @@ package org.netbeans.libs.flatlaf; import com.formdev.flatlaf.FlatSystemProperties; -import java.io.File; -import org.openide.modules.InstalledFileLocator; import org.openide.modules.ModuleInstall; public class Installer extends ModuleInstall { @@ -28,7 +26,6 @@ public class Installer extends ModuleInstall { @Override public void validate() { super.validate(); - File libDirectory = InstalledFileLocator.getDefault().locate("modules/lib", "org.netbeans.libs.flatlaf", false); //NOI18N - System.setProperty( FlatSystemProperties.NATIVE_LIBRARY_PATH, libDirectory.getAbsolutePath() ); + System.setProperty( FlatSystemProperties.NATIVE_LIBRARY_PATH, "system"); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists