Skip to content

Commit

Permalink
Merge pull request #7565 from mbien/flatlaf341
Browse files Browse the repository at this point in the history
Update FlatLaf from 3.3 to 3.5
  • Loading branch information
mbien authored Jul 17, 2024
2 parents bcebbed + 55aa90d commit 0f413a1
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion platform/libs.flatlaf/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

C816DFDF2AC7BD55512597E4605FFCCFF840040D com.formdev:flatlaf:3.3
5BA0BA8CA4A1942BFFF4A2771565F125C07A56A6 com.formdev:flatlaf:3.5
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.3
Files: flatlaf-3.3.jar
Version: 3.5
Files: flatlaf-3.5.jar
License: Apache-2.0
Origin: FormDev Software GmbH.
URL: https://www.formdev.com/flatlaf/
Expand Down
2 changes: 1 addition & 1 deletion platform/libs.flatlaf/manifest.mf
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
OpenIDE-Module-Implementation-Version: 3.5
16 changes: 8 additions & 8 deletions platform/libs.flatlaf/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

is.autoload=true
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
javac.release=8
nbm.target.cluster=platform

spec.version.base.fatal.warning=false
Expand All @@ -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.3.jar=modules/ext/flatlaf-3.3.jar
release.external/flatlaf-3.5.jar=modules/ext/flatlaf-3.5.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.3.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll=modules/lib/flatlaf-windows-x86.dll
release.external/flatlaf-3.3.jar!/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll=modules/lib/flatlaf-windows-x86_64.dll
release.external/flatlaf-3.3.jar!/com/formdev/flatlaf/natives/flatlaf-windows-arm64.dll=modules/lib/flatlaf-windows-arm64.dll
release.external/flatlaf-3.3.jar!/com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib=modules/lib/libflatlaf-macos-arm64.dylib
release.external/flatlaf-3.3.jar!/com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib=modules/lib/libflatlaf-macos-x86_64.dylib
release.external/flatlaf-3.3.jar!/com/formdev/flatlaf/natives/libflatlaf-linux-x86_64.so=modules/lib/libflatlaf-linux-x86_64.so
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
jnlp.verify.excludes=\
modules/lib/flatlaf-windows-x86.dll,\
modules/lib/flatlaf-windows-x86_64.dll,\
Expand Down
4 changes: 2 additions & 2 deletions platform/libs.flatlaf/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<package>com.formdev.flatlaf.util</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/flatlaf-3.3.jar</runtime-relative-path>
<binary-origin>external/flatlaf-3.3.jar</binary-origin>
<runtime-relative-path>ext/flatlaf-3.5.jar</runtime-relative-path>
<binary-origin>external/flatlaf-3.5.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ FlatLafOptionsPanel.unifiedTitleBarCheckBox.text=&Unified window title bar
FlatLafOptionsPanel.menuBarEmbeddedCheckBox.text=&Embedded menu bar
FlatLafOptionsPanel.underlineMenuSelectionCheckBox.text=Use underline menu &selection
FlatLafOptionsPanel.alwaysShowMnemonicsCheckBox.text=Always show &mnemonics
FlatLafOptionsPanel.showFileChooserFavoritesCheckBox.text=Show favorites in file chooser (experimental)
FlatLafOptionsPanel.showFileChooserFavoritesCheckBox.text=Show favorites in file chooser

LookAndFeel.Config.displayName=Look and Feel
FlatLafOptionsPanel.Advanced.title=Advanced
Expand Down

0 comments on commit 0f413a1

Please sign in to comment.