diff --git a/.idea/misc.xml b/.idea/misc.xml index e5d629592..8c0cac2af 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index bbf111fd5..77cc63dbf 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 - 19 + 20 @@ -34,7 +34,7 @@ 2.6.2 - 1.3.0-SNAPSHOT + 2.0.0 1.2.0 1.2.0 1.2.0 @@ -48,14 +48,14 @@ 2.2 31.1-jre 2.10.1 - 19.0.2.1 + 20.0.1 4.3.0 9.31 1.4.5 2.0.6 0.5.1 1.7.0 - 1.1.0 + 1.2.0 5.9.2 diff --git a/src/main/java/org/cryptomator/ui/traymenu/AppindicatorTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AppindicatorTrayMenuController.java index 8f8e7653f..4be9b690f 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AppindicatorTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AppindicatorTrayMenuController.java @@ -13,8 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.lang.foreign.MemoryAddress; -import java.lang.foreign.MemorySession; +import java.lang.foreign.MemorySegment; +import java.lang.foreign.SegmentScope; import java.net.URI; import java.net.URISyntaxException; import java.nio.file.Paths; @@ -27,9 +27,9 @@ public class AppindicatorTrayMenuController implements TrayMenuController { private static final Logger LOG = LoggerFactory.getLogger(AppindicatorTrayMenuController.class); - private final MemorySession session = MemorySession.openShared(); - private MemoryAddress indicator; - private MemoryAddress menu = gtk_menu_new(); + private final SegmentScope scope = SegmentScope.auto(); + private MemorySegment indicator; + private MemorySegment menu = gtk_menu_new(); @CheckAvailability public static boolean isAvailable() { @@ -64,7 +64,7 @@ public class AppindicatorTrayMenuController implements TrayMenuController { } - private void addChildren(MemoryAddress menu, List items) { + private void addChildren(MemorySegment menu, List items) { for (var item : items) { // TODO: use Pattern Matching for switch, once available if (item instanceof ActionItem a) { @@ -72,7 +72,7 @@ public class AppindicatorTrayMenuController implements TrayMenuController { gtk_menu_item_set_label(gtkMenuItem, MemoryAllocator.ALLOCATE_FOR(a.title())); g_signal_connect_object(gtkMenuItem, MemoryAllocator.ALLOCATE_FOR("activate"), - MemoryAllocator.ALLOCATE_CALLBACK_FOR(new ActionItemCallback(a), session), + MemoryAllocator.ALLOCATE_CALLBACK_FOR(new ActionItemCallback(a), scope), menu, 0); gtk_menu_shell_append(menu, gtkMenuItem);