diff --git a/README.md b/README.md index 12e89ff..a7dfcd1 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ A powerful in-process event dispatcher based on Kotlin and Coroutines. ## Download **Gradle Kotlin DSL** ```kotlin -implementation("org.rationalityfrontline:kevent:2.3.0") +implementation("org.rationalityfrontline:kevent:2.3.1") ``` **Maven** @@ -43,7 +43,7 @@ implementation("org.rationalityfrontline:kevent:2.3.0") org.rationalityfrontline kevent - 2.3.0 + 2.3.1 ``` diff --git a/build.gradle.kts b/build.gradle.kts index 1401c4c..fb4b093 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "org.rationalityfrontline" -version = "2.3.0" +version = "2.3.1" val NAME = "kevent" val DESC = "A powerful in-process event dispatcher based on Kotlin and Coroutines" val GITHUB_REPO = "RationalityFrontline/kevent" @@ -20,7 +20,7 @@ repositories { } dependencies { - val coroutinesVersion = "1.7.3" + val coroutinesVersion = "1.8.0" /** Kotlin --------------------------------------------------------- */ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$coroutinesVersion") /** Logging -------------------------------------------------------- */ @@ -32,6 +32,7 @@ dependencies { testImplementation(kotlin("test")) testImplementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion") testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion") + testRuntimeOnly("org.junit.platform:junit-platform-commons:1.10.2") testRuntimeOnly(kotlin("reflect")) testRuntimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:$coroutinesVersion") } @@ -48,7 +49,7 @@ tasks { kotlinOptions.jvmTarget = "11" } dokkaHtml { - outputDirectory.set(buildDir.resolve("javadoc")) + outputDirectory.set(layout.buildDirectory.dir("javadoc")) moduleName.set("KEvent") dokkaSourceSets { named("main") { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..17655d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/kotlin/org/rationalityfrontline/kevent/ThreadingFeature.kt b/src/test/kotlin/org/rationalityfrontline/kevent/ThreadingFeature.kt index fde2632..4359d36 100644 --- a/src/test/kotlin/org/rationalityfrontline/kevent/ThreadingFeature.kt +++ b/src/test/kotlin/org/rationalityfrontline/kevent/ThreadingFeature.kt @@ -45,7 +45,7 @@ object ThreadingFeature : Spek({ runBlocking(Dispatchers.Main) { jlabel.text = "0" } - SubscriberThreadMode.values().forEach { threadMode -> + SubscriberThreadMode.entries.forEach { threadMode -> KEVENT.subscribe(TestEventType.A, threadMode) { event -> when (threadMode) { SubscriberThreadMode.UI -> { @@ -90,7 +90,10 @@ object ThreadingFeature : Spek({ addAllKindsOfSubscribers() } afterFeature { - jframe.dispatchEvent(WindowEvent(jframe, WindowEvent.WINDOW_CLOSING)) + GlobalScope.launch { + delay(10) + jframe.dispatchEvent(WindowEvent(jframe, WindowEvent.WINDOW_CLOSING)) + } KEVENT.clear() }