angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 07:17:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Native libraries: support Gradle cache when running in development environment (issue #800)

Browse Source
This commit is contained in:
Karl Tauber
2024-02-02 19:02:56 +01:00
parent bc0d5dc9b5
commit 8adb7e3021
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java
View File

@@ -178,21 +178,39 @@ class FlatNativeLibrary
// build library file // build library file
String libraryName = buildLibraryName( jarFile, classifier, ext ); String libraryName = buildLibraryName( jarFile, classifier, ext );
File parent = jarFile.getParentFile(); File jarDir = jarFile.getParentFile();
// check whether native library exists in same directory as jar // check whether native library exists in same directory as jar
File libraryFile = new File( parent, libraryName ); File libraryFile = new File( jarDir, libraryName );
if( libraryFile.isFile() ) if( libraryFile.isFile() )
return libraryFile; return libraryFile;
// if jar is in "lib" directory, then also check whether native library exists // if jar is in "lib" directory, then also check whether native library exists
// in "../bin" directory // in "../bin" directory
if( parent.getName().equalsIgnoreCase( "lib" ) ) { if( jarDir.getName().equalsIgnoreCase( "lib" ) ) {
libraryFile = new File( parent.getParentFile(), "bin/" + libraryName ); libraryFile = new File( jarDir.getParentFile(), "bin/" + libraryName );
if( libraryFile.isFile() ) if( libraryFile.isFile() )
return libraryFile; return libraryFile;
} }
// special case: support Gradle cache when running in development environment
// <user-home>/.gradle/caches/modules-2/files-2.1/com.formdev/flatlaf/<version>/<hash-1>/flatlaf-<version>.jar
// <user-home>/.gradle/caches/modules-2/files-2.1/com.formdev/flatlaf/<version>/<hash-2>/flatlaf-<version>-windows-x86_64.dll
String path = jarDir.getAbsolutePath().replace( '\\', '/' );
if( path.contains( "/.gradle/caches/" ) ) {
File versionDir = jarDir.getParentFile();
if( libraryName.contains( versionDir.getName() ) ) {
File[] dirs = versionDir.listFiles();
if( dirs != null ) {
for( File dir : dirs ) {
libraryFile = new File( dir, libraryName );
if( libraryFile.isFile() )
return libraryFile;
}
}
}
}
// native library not found // native library not found
return null; return null;
} }