Merge branch 'main' into svg-fuzzy

Author: nedtwigg

.gitattributes

@@ -1,3 +1,4 @@
 * text=auto eol=lf
 *.MF text eol=crlf
 *.jar binary
+*.dylib binary

CHANGES.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased]
 
+## [5.2.0] - 2025-08-28
+### Added
+- `MacDeepLink` class and dylibs for supporting deep links on modern versions of macOS.
+
+## [5.1.0] - 2025-08-21
+### Added
+- Add `META-INF/services` metadata to support Kotlin coroutines `Dispatchers.Main`.
+
 ## [5.0.1] - 2025-01-26
 ### Changed
 - Downgrade from Kotlin `2.1.0` to `2.0.21`

CLAUDE.md

@@ -0,0 +1,39 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build Commands
+
+This is a Gradle-based Java/Kotlin project focused on SWT (Standard Widget Toolkit) utilities. Standard gradle tasks.
+
+### macOS-specific Requirements
+- On macOS, SWT tests require the `-XstartOnFirstThread` JVM argument (automatically configured in build.gradle).
+
+## Project Architecture
+### Multi-Module Structure
+DurianSwt is organized as a multi-module Gradle project with platform-specific implementations:
+
+- **durian-swt.os**: Platform detection utilities (OS, Arch, SwtPlatform) - no SWT dependencies
+- **durian-swt**: Main module with core SWT utilities and builders
+- **platform-specific modules**: (durian-swt.cocoa.macosx.aarch64, durian-swt.cocoa.macosx.x86_64, durian-swt.gtk.linux.x86_64, durian-swt.win32.win32.x86_64)
+
+## Native Components
+
+### macOS Deep Link Support (`natives/mac-deep-link/`)
+
+Contains Objective-C code for handling deep links via a custom `diffplug://` protocol on macOS without breaking SWT:
+
+- **DeepLinkBridge.m**: JNI bridge that intercepts URL open events from macOS
+- **compile-one.sh**: Compiles the native library for a specific architecture (x86_64 or arm64)
+- **clean-and-build.sh**: Builds for both architectures and deploys to appropriate module resources
+
+To rebuild native libraries:
+```bash
+cd natives/mac-deep-link
+./clean-and-build.sh  # Builds for both architectures
+# Or compile for specific architecture:
+./compile-one.sh arm64    # Apple Silicon
+./compile-one.sh x86_64   # Intel
+```
+
+The resulting `DeepLinkBridge.dylib` files are placed in the platform-specific modules under `src/main/resources/durian-swt-natives/`.

README.md

@@ -14,8 +14,8 @@ output = [
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.durian%3Adurian--swt-blue.svg)](https://search.maven.org/artifact/com.diffplug.durian/durian-swt)
 [![Apache 2.0](https://img.shields.io/badge/license-apache--2.0-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
 
-[![Changelog](https://img.shields.io/badge/changelog-5.0.1-brightgreen.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-yes-brightgreen.svg)](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/overview-summary.html)
+[![Changelog](https://img.shields.io/badge/changelog-5.2.0-brightgreen.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-yes-brightgreen.svg)](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/overview-summary.html)
 [![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/durian)
 [![Travis CI](https://travis-ci.org/diffplug/durian-swt.svg?branch=master)](https://travis-ci.org/diffplug/durian-swt)
 <!---freshmark /shields -->
@@ -25,11 +25,11 @@ output = prefixDelimiterReplace(input, 'https://javadoc.io/static/com.diffplug.d
 -->
 ### Infrastructure
 
-* [`ControlWrapper`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/ControlWrapper.html) - create custom widgets which properly encapsulate their base control.
-* [`Coat`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/Coat.html) - a functional interface for populating an empty Composite.
-* [`CoatMux`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/CoatMux.html) - a mechanism for layering and swapping Coats.
-* [`SwtExec`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/SwtExec.html) - an `ExecutorService` which executes on the SWT thread.
-* [`SwtExec.Guarded`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/SwtExec.Guarded.html) - an `ExecutorService` which is tied to the lifetime of an SWT widget. Say goodbye to `SWTException: Widget is disposed` forever! It can also subscribe to any kind of observable (Guava's ListenableFuture or RxJava's Observable), see [DurianRx](https://github.com/diffplug/durian-rx) for more info.
+* [`ControlWrapper`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/ControlWrapper.html) - create custom widgets which properly encapsulate their base control.
+* [`Coat`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/Coat.html) - a functional interface for populating an empty Composite.
+* [`CoatMux`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/CoatMux.html) - a mechanism for layering and swapping Coats.
+* [`SwtExec`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/SwtExec.html) - an `ExecutorService` which executes on the SWT thread.
+* [`SwtExec.Guarded`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/SwtExec.Guarded.html) - an `ExecutorService` which is tied to the lifetime of an SWT widget. Say goodbye to `SWTException: Widget is disposed` forever! It can also subscribe to any kind of observable (Guava's ListenableFuture or RxJava's Observable), see [DurianRx](https://github.com/diffplug/durian-rx) for more info.
 
 ```java
 SwtExec.async().guardOn(textBox).subscribe(serverResponse, txt -> {
@@ -39,7 +39,7 @@ SwtExec.async().guardOn(textBox).subscribe(serverResponse, txt -> {
 
 ### Fluent builders
 
-* [`Layouts`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/Layouts.html) - all the layouts you'll need in SWT
+* [`Layouts`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/Layouts.html) - all the layouts you'll need in SWT
 
 ```java
 void textOkCanel(Composite cmp) {
@@ -58,7 +58,7 @@ void textOkCanel(Composite cmp) {
 }
 ```
 
-* [`Shells`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/Shells.html) - dialogs without boilerplate
+* [`Shells`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/Shells.html) - dialogs without boilerplate
 
 ```java
 Shells.builder(SWT.DIALOG_TRIM, this::textOkCanel)
@@ -67,13 +67,13 @@ Shells.builder(SWT.DIALOG_TRIM, this::textOkCanel)
   .openOnDisplayBlocking();
 ```
 
-* [`Actions`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/jface/Actions.html) - builder and one-liner:
+* [`Actions`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/jface/Actions.html) - builder and one-liner:
 `Actions.create("Redo", this::redo);`
 
-* [`LabelProviders`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/jface/LabelProviders.html) - builder and one-liner:
+* [`LabelProviders`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/jface/LabelProviders.html) - builder and one-liner:
 `LabelProviders.createWithText(Person::getName)`
 
-* [`ColumnFormat`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/ColumnFormat.html) and [`ColumnViewerFormat`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/jface/ColumnViewerFormat.html) - tables and trees without boilerplate
+* [`ColumnFormat`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/ColumnFormat.html) and [`ColumnViewerFormat`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/jface/ColumnViewerFormat.html) - tables and trees without boilerplate
 
 ```java
 ColumnViewerFormat<Person> format = ColumnViewerFormat.builder();
@@ -87,15 +87,15 @@ TreeViewer tree = format.buildTree(parent);
 
 ### Resource management
 
-* [`OnePerWidget`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/OnePerWidget.html) - a cache tied to the lifetime of an SWT Widget.
-* [`ColorPool`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/ColorPool.html) - a pool of colors tied to the lifetime of a widget. `ColorPool.forWidget(widget).getColor(rgbValue)`
-* [`ImageDescriptors`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/jface/ImageDescriptors.html) - use ImageDescriptors with proper resource sharing. `ImageDescriptors.set(btn, imageDescriptor)`
+* [`OnePerWidget`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/OnePerWidget.html) - a cache tied to the lifetime of an SWT Widget.
+* [`ColorPool`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/ColorPool.html) - a pool of colors tied to the lifetime of a widget. `ColorPool.forWidget(widget).getColor(rgbValue)`
+* [`ImageDescriptors`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/jface/ImageDescriptors.html) - use ImageDescriptors with proper resource sharing. `ImageDescriptors.set(btn, imageDescriptor)`
 
 ### Interactive testing
 
 Ideally, all UI code would have fully automated UI testing, but
 such tests are time-consuming to write, so they often just don't
-get written at all. [`InteractiveTest`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/InteractiveTest.html)
+get written at all. [`InteractiveTest`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/InteractiveTest.html)
 bridges the gap by making it easy to write user-in-the-loop guided tests. Furthermore,
 these tests can even be run in a [headless enviroment on a CI server](https://github.com/diffplug/durian-swt/blob/master/build.gradle#L66-L93), where the test UI
 will be opened, then automatically closed after a timeout.  This ensures that the tests
@@ -127,23 +127,23 @@ InteractiveTest.testCoat(message, cmp -> {
 
 ### Miscellaneous stuff
 
-* [`SwtMisc`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/SwtMisc.html) - useful static methods.
+* [`SwtMisc`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/SwtMisc.html) - useful static methods.
   + `blockForError`, `blockForSuccess`, `blockForQuestion`, etc. - opens a dialog and blocks for the user's response, can be called from any thread.
   + `loopUntil`, `loopUntilDisposed`, `loopUntilGet` - spins the SWT display loop until some condition is satisfied.
   + `systemFontHeight/Width`, `scaleByFont`, `scaleByFontHeight` - resolution-independent sizes.
   + `treeDefControl`, `treeDefComposite` - a [`TreeDef`](http://diffplug.github.io/durian/javadoc/snapshot/com/diffplug/common/base/TreeDef.html) for traversing UI elements.
   + `setEnabledDeep` - sets the enabled status of every child, grandchild, etc. of the given composite.
-* [`SwtRx`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/SwtRx.html) - methods for converting SWT events and models to RxJava Observables.
-* [`SwtDebug`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/SwtDebug.html) - utilities for debugging SWT events.
-* [`OS`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/os/OS.html), [`Arch`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/os/Arch.html), and [`SwtPlatform`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/os/SwtPlatform.html) - detect things about the running system, and manipulate the SWT jars for build tools.
+* [`SwtRx`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/SwtRx.html) - methods for converting SWT events and models to RxJava Observables.
+* [`SwtDebug`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/SwtDebug.html) - utilities for debugging SWT events.
+* [`OS`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/os/OS.html), [`Arch`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/os/Arch.html), and [`SwtPlatform`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/os/SwtPlatform.html) - detect things about the running system, and manipulate the SWT jars for build tools.
   + These do not require SWT or JFace, so you can add DurianSwt to your gradle or maven dependencies without needing to also figure out the SWT messiness.
   + You can also just copy-paste these straight into your own code - they have no external dependencies.
 ```java
 String installerExtension = OS.getNative().winMacLinux("exe","dmg","sh");
 String helperBinary = "driver_" + Arch.getNative().x86x64("", "_64") + ".dll";
 String swtJarName = "org.eclipse.swt." + SwtPlatform.getRunning();
 ```
-* [`ViewerMisc`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.0.1/com/diffplug/common/swt/jface/ViewerMisc.html) - useful static methods for JFace viewers.
+* [`ViewerMisc`](https://javadoc.io/static/com.diffplug.durian/durian-swt/5.2.0/com/diffplug/common/swt/jface/ViewerMisc.html) - useful static methods for JFace viewers.
   + `singleSelection`, `multiSelection` - returns an RxBox for listening to and setting the selection of a viewer.
   + `setTreeContentProvider`, `setLazyTreeContentProvider` - uses a TreeDef to provide the content of a TreeViewer.
 

build.gradle

@@ -20,10 +20,8 @@ subprojects { subProject ->
 
 	ext.maven_name = subProject.name
 	ext.javadoc_links = [
-		"https://javadoc.io/doc/com.diffplug.durian/durian-core/${VER_DURIAN}",
 		"https://javadoc.io/doc/com.diffplug.durian/durian-collect/${VER_DURIAN}",
 		"https://javadoc.io/doc/com.diffplug.durian/durian-concurrent/${VER_DURIAN}",
-		"https://javadoc.io/doc/com.diffplug.durian/durian-debug/${VER_DURIAN_DEBUG}",
 		"https://javadoc.io/doc/com.diffplug.durian/durian-rx/${VER_DURIAN_RX}",
 		'https://docs.oracle.com/javase/8/docs/api/'
 	].join(' ')
@@ -37,6 +35,15 @@ subprojects { subProject ->
 	if (subProject.name == 'durian-swt') {
 		// configured there
 	} else if (subProject.name == 'durian-swt.os') {
+		// not sure why this spotless black for durian-swt.os is required
+		spotless {
+			groovyGradle {
+				clearSteps()
+			}
+			java {
+				clearSteps()
+			}
+		}
 		dependencies {
 			compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 			testImplementation "junit:junit:$VER_JUNIT"
@@ -47,7 +54,7 @@ subprojects { subProject ->
 		}
 	} else {
 		String platformCode = project.name.substring('durian-swt.'.length())
-		String SWT_TO_USE = platformCode.endsWith("x86") ? SWT_VERSION_X86 : SWT_VERSION
+		String SWT_TO_USE = platformCode.endsWith("x86") ? VER_ECLIPSE_PLATFORM_X86 : VER_ECLIPSE_PLATFORM
 		apply plugin: 'dev.equo.p2deps'
 		p2deps {
 			into 'api', {
@@ -60,6 +67,7 @@ subprojects { subProject ->
 		}
 		dependencies {
 			api project(':durian-swt')
+			implementation "com.diffplug.durian:durian-core:$VER_DURIAN"
 		}
 		configurations.all {
 			resolutionStrategy.eachDependency { DependencyResolveDetails details ->

durian-swt.cocoa.macosx.aarch64/src/main/java/com/diffplug/common/swt/MacDeepLink.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.common.swt;
+
+import com.diffplug.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * - immediately on app startup, call `MacDeepLink.startCapturingBeforeSwt()`
+ * - once SWT has initialized, call `MacDeepLink.swtHasInitializedBeginReceiving(Consumer<String>)`
+ *   - all urls which were captured before SWT initialized will be passed immediately (on the SWT thread)
+ *
+ * That's all! Don't do anything else.
+ */
+public class MacDeepLink {
+	/**
+	 * state transitions are:
+	 * - `null` on startup
+	 * - `startCapturingBeforeSwt()` transitions to an `ArrayList<String>`, backlog urls get added to it
+	 * - `swtHasInitializedBeginReceiving()` transitions to a `Consumer<String>`, all new urls go there
+	 */
+	private static final AtomicReference<@Nullable Object> state = new AtomicReference<>();
+
+	public static void startCapturingBeforeSwt() {
+		String libPath = System.getProperty("durian-swt.library.path");
+		if (libPath != null) {
+			System.load(libPath + "/durian-swt-natives/DeepLinkBridge.dylib");
+		} else {
+			throw new IllegalArgumentException("You need to set 'durian-swt.library.path'");
+		}
+
+		var was = state.getAndSet(new ArrayList<>());
+		Preconditions.checkArgument(was == null, "`startCapturingBeforeSwt() should be called first`");
+		nativeBeforeSwt();
+	}
+
+	public static void swtHasInitializedBeginReceiving(Consumer<String> handler) {
+		SwtMisc.assertUI();
+		var was = state.getAndSet(handler);
+		Preconditions.checkArgument(was instanceof ArrayList<?>, "Call `applicationStartBeforeSwt()` first.");
+
+		var backlog = (ArrayList<String>) was;
+		backlog.forEach(handler);
+
+		nativeAfterSwt();
+	}
+
+	// Native method declarations - implemented in DeepLinkBridge.m
+	private static native void nativeBeforeSwt();
+
+	private static native void nativeAfterSwt();
+
+	/**
+	 * Called from native code when a URL is received.
+	 * This method is invoked on various threads by the native code.
+	 * 
+	 * @param url The URL string received from the operating system
+	 */
+	public static void __internal_deliverUrl(String url) {
+		var was = state.get();
+		if (was instanceof Consumer) {
+			((Consumer<String>) was).accept(url);
+		} else if (was instanceof ArrayList<?>) {
+			((ArrayList<String>) was).add(url);
+		} else {
+			throw new IllegalStateException("Expected Consumer or ArrayList, was " + was);
+		}
+	}
+}