diff --git a/build.gradle b/build.gradle index 521145f0da310eea158bf06da1e35867c2df9d3e..d893c35e9a3a03b0e18b3336876c39f051b4d94c 100644 --- a/build.gradle +++ b/build.gradle @@ -26,12 +26,12 @@ allprojects { } dependencies { - implementation 'org.slf4j:slf4j-api:2.0.5' + implementation 'org.slf4j:slf4j-api:2.0.6' compileOnly 'org.jetbrains:annotations:23.1.0' testImplementation 'ch.qos.logback:logback-classic:1.3.5' testImplementation 'org.hamcrest:hamcrest-library:2.2' - testImplementation 'org.mockito:mockito-core:4.9.0' + testImplementation 'org.mockito:mockito-core:4.10.0' testImplementation 'org.assertj:assertj-core:3.23.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 6448c5e183564c1ffa689f29bee53fd15aa80f17..2a2cd5fc254250c1467dad62e8b567b909dd1c8a 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -9,7 +9,7 @@ dependencies { // TODO: move resources decoding to separate plugin module implementation 'com.android.tools.build:aapt2-proto:7.3.1-8691043' - implementation 'com.google.protobuf:protobuf-java:3.21.11' // forcing latest version + implementation 'com.google.protobuf:protobuf-java:3.21.12' // forcing latest version testImplementation 'org.apache.commons:commons-lang3:3.12.0' diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index b2e3bb2b328416ce089f86203fbd0d04589f6654..177a527449d243494765e173697ff1849c9bc64d 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -2,7 +2,7 @@ plugins { id 'application' id 'edu.sc.seis.launch4j' version '2.5.4' id 'com.github.johnrengelman.shadow' version '7.1.2' - id 'org.beryx.runtime' version '1.12.7' + id 'org.beryx.runtime' version '1.13.0' } dependencies { @@ -11,13 +11,13 @@ dependencies { implementation 'com.beust:jcommander:1.82' implementation 'ch.qos.logback:logback-classic:1.3.5' - implementation 'com.fifesoft:rsyntaxtextarea:3.3.0' + implementation 'com.fifesoft:rsyntaxtextarea:3.3.1' implementation files('libs/jfontchooser-1.0.5.jar') implementation 'hu.kazocsaba:image-viewer:1.2.3' - implementation 'com.formdev:flatlaf:2.6' - implementation 'com.formdev:flatlaf-intellij-themes:2.6' - implementation 'com.formdev:flatlaf-extras:2.6' + implementation 'com.formdev:flatlaf:3.0' + implementation 'com.formdev:flatlaf-intellij-themes:3.0' + implementation 'com.formdev:flatlaf-extras:3.0' implementation 'com.formdev:svgSalamander:1.1.4' implementation 'com.google.code.gson:gson:2.10' diff --git a/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java b/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java index cbd763b411f1c2c17ee910a503eb08ff145052c4..cc06f216ed21c38810541dbabbb2d43ec859d1ef 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java @@ -15,6 +15,8 @@ import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatLightLaf; import com.formdev.flatlaf.extras.FlatAnimatedLafChange; import com.formdev.flatlaf.intellijthemes.FlatAllIJThemes; +import com.formdev.flatlaf.themes.FlatMacDarkLaf; +import com.formdev.flatlaf.themes.FlatMacLightLaf; import jadx.gui.settings.JadxSettings; @@ -68,6 +70,8 @@ public class LafManager { // default flatlaf themes map.put(FlatLightLaf.NAME, FlatLightLaf.class.getName()); map.put(FlatDarkLaf.NAME, FlatDarkLaf.class.getName()); + map.put(FlatMacLightLaf.NAME, FlatMacLightLaf.class.getName()); + map.put(FlatMacDarkLaf.NAME, FlatMacDarkLaf.class.getName()); map.put(FlatIntelliJLaf.NAME, FlatIntelliJLaf.class.getName()); map.put(FlatDarculaLaf.NAME, FlatDarculaLaf.class.getName());