Merge pull request #210 from simple-robot/dev/main

Release: v1.8.0

Author: ForteScarlet

.github/workflows/publish-release.yml

@@ -41,9 +41,15 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
+          arguments: |
+            assemble
+            allTests
+            --stacktrace 
+            --warning-mode all 
+            -Pkotlin.native.enableKlibsCrossCompilation=false
 
-      - name: Run all tests
-        run: gradle assemble allTests --stacktrace --warning-mode all
+#      - name: Run all tests
+#        run: gradle assemble allTests --stacktrace --warning-mode all -Pkotlin.native.enableKlibsCrossCompilation=false
 
   publish-releases:
     name: Publish releases

.github/workflows/publish-snapshot.yml

@@ -62,9 +62,15 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
+          arguments: |
+            assemble
+            allTests
+            --stacktrace 
+            --warning-mode all 
+            -Pkotlin.native.enableKlibsCrossCompilation=false
 
-      - name: Run all tests
-        run: gradle assemble allTests --stacktrace --warning-mode all
+#      - name: Run all tests
+#        run: gradle assemble allTests --stacktrace --warning-mode all -Pkotlin.native.enableKlibsCrossCompilation=false
 
   publish-snapshots:
     name: Publish snapshots

build.gradle.kts

@@ -138,6 +138,9 @@ apiValidation {
             "love.forte.simbot.annotations.InternalSimbotAPI",
             "love.forte.simbot.component.onebot.common.annotations.ApiResultConstructor",
             "love.forte.simbot.component.onebot.common.annotations.SourceEventConstructor",
+
+            // CustomEventResolver
+            "love.forte.simbot.component.onebot.v11.core.event.ExperimentalCustomEventResolverApi"
         ),
     )
 

buildSrc/src/main/kotlin/JvmConfig.kt

@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 
 inline fun KotlinJvmTarget.configJava(jdkVersion: Int, crossinline block: KotlinJvmTarget.() -> Unit = {}) {
-    withJava()
     compilerOptions {
         javaParameters.set(true)
         jvmTarget.set(JvmTarget.fromTarget(jdkVersion.toString()))
@@ -88,12 +87,15 @@ inline fun Project.configJavaCompileWithModule(
         targetCompatibility = jvmVersion
 
         if (moduleName != null) {
-            options.compilerArgumentProviders.add(
-                CommandLineArgumentProvider {
+            options.compilerArgumentProviders.add(CommandLineArgumentProvider {
+                val sourceSet = sourceSets.findByName("main") ?: sourceSets.findByName("jvmMain")
+                if (sourceSet != null) {
                     // Provide compiled Kotlin classes to javac – needed for Java/Kotlin mixed sources to work
-                    listOf("--patch-module", "$moduleName=${sourceSets["main"].output.asPath}")
+                    listOf("--patch-module", "$moduleName=${sourceSet.output.asPath}")
+                } else {
+                    emptyList()
                 }
-            )
+            })
         }
 
         block()

buildSrc/src/main/kotlin/P.kt

@@ -37,8 +37,8 @@ object P {
         override val description: String get() = DESCRIPTION
         override val homepage: String get() = HOMEPAGE
 
-        const val VERSION = "1.7.0"
-        const val NEXT_VERSION = "1.7.1"
+        const val VERSION = "1.8.0"
+        const val NEXT_VERSION = "1.8.1"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

buildSrc/src/main/kotlin/simbot-onebot-changelog-generator.gradle.kts

@@ -16,7 +16,7 @@
  */
 
 
-tasks.create("createChangelog") {
+tasks.register("createChangelog") {
     group = "documentation"
     doFirst {
         val realVersion = P.ComponentOneBot.version.toString()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Mar 21 17:22:56 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

simbot-component-onebot-common/build.gradle.kts

@@ -59,12 +59,6 @@ kotlin {
             api(kotlin("test"))
         }
 
-        jvmMain {
-            dependencies {
-                compileOnly(libs.simbot.api)
-            }
-        }
-
         jvmTest.dependencies {
             implementation(libs.log4j.api)
             implementation(libs.log4j.core)

simbot-component-onebot-v11/simbot-component-onebot-v11-common/build.gradle.kts

@@ -51,8 +51,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":simbot-component-onebot-common"))
-            implementation(libs.simbot.common.annotations)
+            api(project(":simbot-component-onebot-common"))
+            api(libs.simbot.common.annotations)
             api(libs.kotlinx.serialization.core)
         }
 
@@ -62,10 +62,6 @@ kotlin {
             api(libs.kotlinx.coroutines.test)
         }
 
-        jvmMain.dependencies {
-            compileOnly(libs.simbot.common.annotations)
-        }
-
         jvmTest.dependencies {
             compileOnly(libs.simbot.common.annotations)
             implementation(libs.log4j.api)

simbot-component-onebot-v11/simbot-component-onebot-v11-core/api/simbot-component-onebot-v11-core.api

@@ -1104,7 +1104,10 @@ public abstract interface class love/forte/simbot/component/onebot/v11/core/api/
 	public abstract fun getAction ()Ljava/lang/String;
 	public abstract fun getApiResultDeserializer ()Lkotlinx/serialization/DeserializationStrategy;
 	public abstract fun getBody ()Ljava/lang/Object;
+	public fun getMethod ()Lio/ktor/http/HttpMethod;
 	public abstract fun getResultDeserializer ()Lkotlinx/serialization/DeserializationStrategy;
+	public fun resolveUrlAction (Lio/ktor/http/URLBuilder;Ljava/util/Collection;)V
+	public fun resolveUrlExtensions (Lio/ktor/http/URLBuilder;)V
 }
 
 public final class love/forte/simbot/component/onebot/v11/core/api/OneBotApi$Actions {
@@ -1161,6 +1164,10 @@ public final class love/forte/simbot/component/onebot/v11/core/api/OneBotApiExec
 	public final synthetic fun unbox-impl ()Llove/forte/simbot/component/onebot/v11/core/api/OneBotApiExecutable;
 }
 
+public final class love/forte/simbot/component/onebot/v11/core/api/OneBotApiKt {
+	public static final fun resolveUrl (Llove/forte/simbot/component/onebot/v11/core/api/OneBotApi;Lio/ktor/http/URLBuilder;Ljava/util/Collection;)V
+}
+
 public final class love/forte/simbot/component/onebot/v11/core/api/OneBotApiRequests {
 	public static final fun getApiLogger ()Lorg/slf4j/Logger;
 	public static final synthetic fun request (Llove/forte/simbot/component/onebot/v11/core/api/OneBotApi;Lio/ktor/client/HttpClient;Lio/ktor/http/Url;Ljava/lang/String;Ljava/util/Collection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -2125,6 +2132,29 @@ public final class love/forte/simbot/component/onebot/v11/core/component/OneBot1
 	public static synthetic fun useOneBot11Component$default (Llove/forte/simbot/application/ApplicationFactoryConfigurer;Llove/forte/simbot/common/function/ConfigurerFunction;ILjava/lang/Object;)V
 }
 
+public class love/forte/simbot/component/onebot/v11/core/event/CustomEventResolveException : java/lang/RuntimeException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public abstract interface class love/forte/simbot/component/onebot/v11/core/event/CustomEventResolver$Context {
+	public abstract fun getBot ()Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBot;
+	public abstract fun getJson ()Lkotlinx/serialization/json/Json;
+	public abstract fun getRawEventResolveResult ()Llove/forte/simbot/component/onebot/v11/core/event/RawEventResolveResult;
+}
+
+public class love/forte/simbot/component/onebot/v11/core/event/EventResolveException : java/lang/RuntimeException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public abstract interface annotation class love/forte/simbot/component/onebot/v11/core/event/ExperimentalCustomEventResolverApi : java/lang/annotation/Annotation {
+}
+
 public abstract interface class love/forte/simbot/component/onebot/v11/core/event/OneBotBotEvent : love/forte/simbot/component/onebot/v11/core/event/OneBotEvent, love/forte/simbot/event/BotEvent {
 	public abstract fun getBot ()Llove/forte/simbot/component/onebot/v11/core/bot/OneBotBot;
 }