Remove RxJava (#31)

diffplug · Jan 25, 2025 · 75fcbff · 75fcbff
2 parents 6a4fa5c + 01e6e6a
commit 75fcbff
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 381 deletions.
diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 # gradle stuff
 .gradle/
 build/
+.kotlin/
 
 # IntelliJ
 .idea

diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 ### Changed
+- **BREAKING** `SwtMisc.systemFontWidth` now returns `double` instead of `int`.
+  - added new methods `systemFontWidthTimes(int)` and `systemFontWidthTimes(String)` to make this easier to deal with
+- **BREAKING** remove RxJava completely in favor of Kotlin Flow.
 - Bump required java from 11 to 17.
 
 ## [4.3.1] - 2024-07-05

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,6 @@ subprojects { subProject ->
 		"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://javadoc.io/doc/io.reactivex.rxjava2/rxjava/${VER_RXJAVA}",
 		'https://docs.oracle.com/javase/8/docs/api/'
 	].join(' ')
 

diff --git a/durian-swt/build.gradle b/durian-swt/build.gradle
@@ -22,7 +22,6 @@ p2deps {
 dependencies {
 	api project(':durian-swt.os')
 	api "com.diffplug.durian:durian-rx:$VER_DURIAN_RX"
-	api "io.reactivex.rxjava2:rxjava:$VER_RXJAVA"
 	implementation "com.diffplug.durian:durian-core:$VER_DURIAN"
 	implementation "com.diffplug.durian:durian-collect:$VER_DURIAN"
 	implementation "com.diffplug.durian:durian-concurrent:$VER_DURIAN"

diff --git a/durian-swt/src/main/java/com/diffplug/common/swt/Shells.kt b/durian-swt/src/main/java/com/diffplug/common/swt/Shells.kt
@@ -21,8 +21,7 @@ import com.diffplug.common.swt.os.WS
 import com.diffplug.common.tree.TreeIterable
 import com.diffplug.common.tree.TreeQuery
 import com.diffplug.common.tree.TreeStream
-import io.reactivex.disposables.Disposable
-import io.reactivex.disposables.Disposables
+import kotlinx.coroutines.Job
 import org.eclipse.swt.SWT
 import org.eclipse.swt.graphics.Image
 import org.eclipse.swt.graphics.Point
@@ -36,7 +35,7 @@ import java.util.*
 
 /** A fluent builder for creating SWT [Shell]s.  */
 class Shells private constructor(private val style: Int, private val coat: Coat) {
-    private var title: String = ""
+    private var title: String? = null
     private var image: Image? = null
     private var alpha = SWT.DEFAULT
     private val size = Point(SWT.DEFAULT, SWT.DEFAULT)
@@ -434,17 +433,19 @@ class Shells private constructor(private val style: Int, private val coat: Coat)
 
         /** Prevents the given shell from closing without prompting.  Returns a Subscription which can cancel this blocking.  */
         @JvmStatic
-        fun confirmClose(shell: Shell, title: String, question: String, runOnClose: Runnable): Disposable {
+        fun confirmClose(shell: Shell, title: String, question: String, runOnClose: Runnable): Job {
             val listener = Listener { e: Event ->
                 e.doit = SwtMisc.blockForQuestion(title, question, shell)
                 if (e.doit) {
                     runOnClose.run()
                 }
             }
             shell.addListener(SWT.Close, listener)
-            return Disposables.fromRunnable {
-                SwtExec.immediate().guardOn(shell).execute {
-                    shell.removeListener(SWT.Close, listener)
+            return Job().apply {
+                invokeOnCompletion {
+                    SwtExec.immediate().guardOn(shell).execute {
+                        shell.removeListener(SWT.Close, listener)
+                    }
                 }
             }
         }