调整CI配置

simple-robot · Jul 1, 2024 · 62b4c4f · 62b4c4f
1 parent 38e729f
commit 62b4c4f
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 22 deletions.
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -16,10 +16,7 @@
  */
 
 import love.forte.gradle.common.core.project.ProjectDetail
-import love.forte.gradle.common.core.project.Version
-import love.forte.gradle.common.core.project.minus
 import love.forte.gradle.common.core.property.systemProp
-import love.forte.gradle.common.core.project.version as v
 
 
 /**
@@ -40,11 +37,11 @@ object P {
         override val description: String get() = DESCRIPTION
         override val homepage: String get() = HOMEPAGE
 
+        const val VERSION = "0.9.2"
+        const val NEXT_VERSION = "0.9.2"
 
-        private val baseVersion = v(0, 9, 2)
-
-        val snapshotVersion = baseVersion - Version.SNAPSHOT
-        override val version = if (isSnapshot()) snapshotVersion else baseVersion
+        override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
+        override val version = if (isSnapshot()) snapshotVersion else VERSION
 
         override val developers: List<Developer> = developers {
             developer {

diff --git a/buildSrc/src/main/kotlin/simbot-onebot-dokka-multi-module.gradle.kts b/buildSrc/src/main/kotlin/simbot-onebot-dokka-multi-module.gradle.kts
@@ -33,6 +33,7 @@ fun org.jetbrains.dokka.gradle.AbstractDokkaTask.configOutput(format: String) {
     outputDirectory.set(rootProject.file("build/dokka/$format"))
 }
 
+@Suppress("MaxLineLength")
 tasks.named<org.jetbrains.dokka.gradle.DokkaMultiModuleTask>("dokkaHtmlMultiModule") {
     configOutput("html")
 
@@ -43,6 +44,8 @@ tasks.named<org.jetbrains.dokka.gradle.DokkaMultiModuleTask>("dokkaHtmlMultiModu
     pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
         customAssets = listOf(rootProject.file(".simbot/dokka-assets/logo-icon.svg"))
         customStyleSheets = listOf(rootProject.file(".simbot/dokka-assets/css/kdoc-style.css"))
+        // TODO ?
+        homepageLink = "https://github.com/simple-robot/simbot-component-onebot"
         footerMessage = "© 2024-${Year.now().value} <a href='https://github.com/simple-robot'>Simple Robot</a>, <a href='https://github.com/ForteScarlet'>ForteScarlet</a>. All rights reserved."
         separateInheritedMembers = true
     }

diff --git a/buildSrc/src/main/kotlin/simbot-onebot-dokka-partial-configure.gradle.kts b/buildSrc/src/main/kotlin/simbot-onebot-dokka-partial-configure.gradle.kts
@@ -25,9 +25,10 @@ plugins {
 
 
 // dokka config
+@Suppress("MaxLineLength")
 tasks.withType<DokkaTaskPartial>().configureEach {
     dokkaSourceSets.configureEach {
-        version = P.ComponentOneBot.version.toString()
+        version = P.ComponentOneBot.version
         documentedVisibilities.set(
             listOf(
                 DokkaConfiguration.Visibility.PUBLIC,
@@ -62,7 +63,14 @@ tasks.withType<DokkaTaskPartial>().configureEach {
         sourceLink {
             localDirectory.set(projectDir.resolve("src"))
             val relativeTo = projectDir.relativeTo(rootProject.projectDir)
-            remoteUrl.set(URI.create("${P.ComponentOneBot.HOMEPAGE}/tree/dev/main/$relativeTo/src/").toURL())
+            val uri = URI.create(
+                "${P.ComponentOneBot.HOMEPAGE}/tree/dev/main/${relativeTo.path.replace('\\', '/')}/src/"
+            )
+
+            logger.info("Dokka source link URI: {}", uri)
+
+            // remoteUrl.set(URI.create("${P.ComponentOneBot.HOMEPAGE}/tree/dev/main/$relativeTo/src/").toURL())
+            remoteUrl.set(uri.toURL())
             remoteLineSuffix.set("#L")
         }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ log4j = "2.20.0"
 # simbot
 simbot = "4.1.0"
 suspendTransform = "0.9.0"
-gradleCommon = "0.4.0"
+gradleCommon = "0.6.0"
 # ksp
 ksp = "2.0.0-1.0.22"
 # https://square.github.io/kotlinpoet/

diff --git a/simbot-component-onebot-common/build.gradle.kts b/simbot-component-onebot-common/build.gradle.kts
@@ -17,6 +17,7 @@
 
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
+import love.forte.gradle.common.kotlin.multiplatform.applyTier123
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
@@ -48,9 +49,7 @@ kotlin {
         configJs()
     }
 
-    applyTier1()
-    applyTier2()
-    applyTier3()
+    applyTier123()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-common/build.gradle.kts b/simbot-component-onebot-v11/simbot-component-onebot-v11-common/build.gradle.kts
@@ -17,6 +17,7 @@
 
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
+import love.forte.gradle.common.kotlin.multiplatform.applyTier123
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 
@@ -41,9 +42,7 @@ kotlin {
         configJs()
     }
 
-    applyTier1()
-    applyTier2()
-    applyTier3()
+    applyTier123()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-event/build.gradle.kts b/simbot-component-onebot-v11/simbot-component-onebot-v11-event/build.gradle.kts
@@ -18,6 +18,7 @@
 import com.google.devtools.ksp.gradle.KspTaskMetadata
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
+import love.forte.gradle.common.kotlin.multiplatform.applyTier123
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
@@ -53,9 +54,7 @@ kotlin {
         configJs()
     }
 
-    applyTier1()
-    applyTier2()
-    applyTier3()
+    applyTier123()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-message/build.gradle.kts b/simbot-component-onebot-v11/simbot-component-onebot-v11-message/build.gradle.kts
@@ -18,6 +18,7 @@
 import com.google.devtools.ksp.gradle.KspTaskMetadata
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.kotlin.multiplatform.applyTier1
+import love.forte.gradle.common.kotlin.multiplatform.applyTier123
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
@@ -55,9 +56,7 @@ kotlin {
         configJs()
     }
 
-    applyTier1()
-    applyTier2()
-    applyTier3()
+    applyTier123()
 
     sourceSets {
         commonMain.dependencies {