Merge pull request #837 from simple-robot/pref-build

尝试调整优化项目的构建配置与依赖关系配置
simple-robot · Jun 4, 2024 · 4f5ec24 · 4f5ec24
2 parents 67b168f + b0a595d
commit 4f5ec24
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 140 deletions.
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -85,7 +85,7 @@ sealed class P(override val group: String) : ProjectDetail() {
     val versionWithoutSnapshot: Version
 
     init {
-        val mainVersion = version(4, 0, 0) - version("RC2")
+        val mainVersion = version(4, 0, 0) - version("RC3")
 
         fun initVersionWithoutSnapshot(status: Version?): Version = if (status == null) {
             mainVersion

diff --git a/simbot-api/build.gradle.kts b/simbot-api/build.gradle.kts
@@ -75,15 +75,15 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                // jvm compile only
-                api(libs.jetbrains.annotations)
-                api(project(":simbot-commons:simbot-common-annotations"))
-                api(libs.kotlinx.serialization.json)
+                implementation(project(":simbot-commons:simbot-common-annotations"))
+                implementation(project(":simbot-logger"))
+
                 api(project(":simbot-commons:simbot-common-suspend-runner"))
                 api(project(":simbot-commons:simbot-common-core"))
                 api(project(":simbot-commons:simbot-common-collection"))
                 api(libs.kotlinx.coroutines.core)
                 api(libs.kotlinx.serialization.core)
+                implementation(libs.kotlinx.serialization.json)
                 // suspend reversal annotations
 
             }
@@ -102,7 +102,6 @@ kotlin {
         jvmMain {
             dependencies {
                 compileOnly(libs.jetbrains.annotations)
-                compileOnly(libs.kotlinx.serialization.json)
                 compileOnly(project(":simbot-commons:simbot-common-annotations"))
 
                 compileOnly(libs.kotlinx.coroutines.reactive)
@@ -130,27 +129,6 @@ kotlin {
             implementation(libs.ktor.client.js)
             implementation(libs.ktor.client.core)
         }
-
-        nativeTest.dependencies {
-            // implementation(libs.ktor.client.core)
-            // implementation(libs.ktor.client.cio)
-        }
-
-        linuxTest.dependencies {
-            // implementation(libs.ktor.client.core)
-            // implementation(libs.ktor.client.cio)
-        }
-
-        appleTest.dependencies {
-            // implementation(libs.ktor.client.core)
-            // implementation(libs.ktor.client.cio)
-        }
-
-        mingwTest.dependencies {
-            // implementation(libs.ktor.client.core)
-            // implementation(libs.ktor.client.winhttp)
-        }
-
     }
 }
 

diff --git a/simbot-api/src/jvmMain/java/module-info.java b/simbot-api/src/jvmMain/java/module-info.java
@@ -4,7 +4,7 @@
  *     Project    https://github.com/simple-robot/simpler-robot
  *     Email      ForteScarlet@163.com
  *
- *     This file is part of the Simple Robot Library.
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
@@ -36,6 +36,7 @@
     requires simbot.common.collection;
     requires kotlinx.coroutines.core;
     requires kotlinx.serialization.core;
+    requires kotlinx.serialization.json;
     requires static kotlinx.coroutines.reactive;
     requires static kotlinx.coroutines.reactor;
     requires static kotlinx.coroutines.rx2;

diff --git a/simbot-commons/simbot-common-annotations/build.gradle.kts b/simbot-commons/simbot-common-annotations/build.gradle.kts
@@ -4,7 +4,7 @@
  *     Project    https://github.com/simple-robot/simpler-robot
  *     Email      ForteScarlet@163.com
  *
- *     This file is part of the Simple Robot Library.
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
@@ -27,29 +27,6 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
-/*
- *     Copyright (c) 2023-2024. ForteScarlet.
- *
- *     Project    https://github.com/simple-robot/simpler-robot
- *     Email      ForteScarlet@163.com
- *
- *     This file is part of the Simple Robot Library.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Lesser General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     Lesser GNU General Public License for more details.
- *
- *     You should have received a copy of the Lesser GNU General Public License
- *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
 plugins {
     kotlin("multiplatform")
     id("simbot.dokka-module-configuration")

diff --git a/simbot-commons/simbot-common-atomic/build.gradle.kts b/simbot-commons/simbot-common-atomic/build.gradle.kts
@@ -67,11 +67,6 @@ kotlin {
     }
 
     sourceSets {
-        commonMain {
-            dependencies {
-                // compileOnly(project(":simbot-commons:simbot-common-annotations"))
-            }
-        }
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
@@ -85,12 +80,6 @@ kotlin {
                 implementation(libs.kotlinx.lincheck)
             }
         }
-
-        jsMain {
-            dependencies {
-                // implementation(project(":simbot-commons:simbot-common-annotations"))
-            }
-        }
     }
 }
 

diff --git a/simbot-commons/simbot-common-collection/build.gradle.kts b/simbot-commons/simbot-common-collection/build.gradle.kts
@@ -44,12 +44,6 @@ kotlin {
     explicitApi()
     applyDefaultHierarchyTemplate()
 
-    sourceSets.configureEach {
-        languageSettings {
-            // optIn("love.forte.simbot.common.collection.ExperimentalSimbotCollectionApi")
-        }
-    }
-
     configKotlinJvm(JVMConstants.KT_JVM_TARGET_VALUE)
 
     js(IR) {
@@ -76,8 +70,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                // compileOnly(project(":simbot-commons:simbot-common-annotations"))
-                compileOnly(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
         commonTest {
@@ -87,24 +80,16 @@ kotlin {
             }
         }
 
+        jvmMain.dependencies {
+            compileOnly(libs.kotlinx.coroutines.core)
+        }
+
         jvmTest {
             dependencies {
                 implementation(kotlin("test-junit5"))
                 implementation(libs.kotlinx.lincheck)
             }
         }
-
-        nativeMain.dependencies {
-            api(libs.kotlinx.coroutines.core)
-        }
-
-        jsMain.dependencies {
-            api(libs.kotlinx.coroutines.core)
-        }
-
-        getByName("wasmJsMain").dependencies {
-            api(libs.kotlinx.coroutines.core)
-        }
     }
 }
 

diff --git a/simbot-commons/simbot-common-core/build.gradle.kts b/simbot-commons/simbot-common-core/build.gradle.kts
@@ -69,10 +69,11 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
+                implementation(project(":simbot-commons:simbot-common-annotations"))
+                implementation(libs.kotlinx.coroutines.core)
+
                 api(project(":simbot-commons:simbot-common-suspend-runner"))
                 api(project(":simbot-commons:simbot-common-collection"))
-                compileOnly(libs.kotlinx.coroutines.core)
                 api(libs.kotlinx.serialization.core)
             }
         }
@@ -86,6 +87,7 @@ kotlin {
         }
 
         jvmMain.dependencies {
+            compileOnly(project(":simbot-commons:simbot-common-annotations"))
             compileOnly(libs.kotlinx.coroutines.reactor)
             compileOnly(libs.kotlinx.coroutines.reactive)
         }
@@ -97,21 +99,6 @@ kotlin {
                 implementation("io.projectreactor:reactor-test:3.6.2")
             }
         }
-
-        nativeMain.dependencies {
-            api(project(":simbot-commons:simbot-common-annotations"))
-            api(libs.kotlinx.coroutines.core)
-        }
-
-        jsMain.dependencies {
-            api(project(":simbot-commons:simbot-common-annotations"))
-            api(libs.kotlinx.coroutines.core)
-        }
-
-        getByName("wasmJsMain").dependencies {
-            api(project(":simbot-commons:simbot-common-annotations"))
-            api(libs.kotlinx.coroutines.core)
-        }
     }
 }
 

diff --git a/simbot-commons/simbot-common-core/src/jvmMain/java/module-info.java b/simbot-commons/simbot-common-core/src/jvmMain/java/module-info.java
@@ -1,9 +1,9 @@
 module simbot.common.core {
     requires kotlin.stdlib;
+    requires kotlinx.coroutines.core;
     requires static simbot.common.annotations;
     requires transitive simbot.common.suspendrunner;
     requires transitive simbot.common.collection;
-    requires static kotlinx.coroutines.core;
     requires static kotlinx.coroutines.reactor;
     requires transitive kotlinx.serialization.core;
     requires static reactor.core;

diff --git a/simbot-commons/simbot-common-ktor-inputfile/build.gradle.kts b/simbot-commons/simbot-common-ktor-inputfile/build.gradle.kts
@@ -53,7 +53,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            compileOnly(libs.ktor.client.core)
+            implementation(libs.ktor.client.core)
         }
         commonTest {
             dependencies {
@@ -68,14 +68,6 @@ kotlin {
                 implementation(project(":simbot-logger-slf4j2-impl"))
             }
         }
-
-        jsMain.dependencies {
-            implementation(libs.ktor.client.core)
-        }
-
-        nativeMain.dependencies {
-            implementation(libs.ktor.client.core)
-        }
     }
 }
 
diff --git a/simbot-commons/simbot-common-ktor-inputfile/src/jvmMain/java/module-info.java b/simbot-commons/simbot-common-ktor-inputfile/src/jvmMain/java/module-info.java
@@ -1,9 +1,9 @@
 module simbot.common.ktor.inputfile {
     requires kotlin.stdlib;
-    requires static io.ktor.http;
-    requires static io.ktor.client.core;
-    requires static io.ktor.utils;
-    requires static io.ktor.io;
+    requires io.ktor.http;
+    requires io.ktor.client.core;
+    requires io.ktor.utils;
+    requires io.ktor.io;
 
     exports love.forte.simbot.common.ktor.inputfile;
 }
diff --git a/simbot-commons/simbot-common-suspend-runner/build.gradle.kts b/simbot-commons/simbot-common-suspend-runner/build.gradle.kts
@@ -4,7 +4,7 @@
  *     Project    https://github.com/simple-robot/simpler-robot
  *     Email      ForteScarlet@163.com
  *
- *     This file is part of the Simple Robot Library.
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
@@ -59,8 +59,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":simbot-logger"))
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
+                implementation(project(":simbot-commons:simbot-common-annotations"))
+                implementation(project(":simbot-logger"))
+
                 api(libs.kotlinx.coroutines.core)
             }
         }
@@ -72,6 +73,7 @@ kotlin {
         }
 
         jvmMain.dependencies {
+            compileOnly(project(":simbot-commons:simbot-common-annotations"))
             compileOnly(libs.kotlinx.coroutines.reactor)
             compileOnly(libs.kotlinx.coroutines.rx2)
             compileOnly(libs.kotlinx.coroutines.rx3)
@@ -86,18 +88,6 @@ kotlin {
                 implementation("io.projectreactor:reactor-test:3.6.2")
             }
         }
-
-        nativeMain.dependencies {
-            api(project(":simbot-commons:simbot-common-annotations"))
-        }
-
-        jsMain.dependencies {
-            api(project(":simbot-commons:simbot-common-annotations"))
-        }
-
-        getByName("wasmJsMain").dependencies {
-            implementation(project(":simbot-commons:simbot-common-annotations"))
-        }
     }
 }
 

diff --git a/simbot-cores/simbot-core-spring-boot-starter-v2/build.gradle.kts b/simbot-cores/simbot-core-spring-boot-starter-v2/build.gradle.kts
@@ -63,6 +63,7 @@ kotlin {
 
 @Suppress("VulnerableLibrariesLocal")
 dependencies {
+    implementation(project(":simbot-logger"))
     compileOnly(project(":simbot-commons:simbot-common-annotations"))
     api(project(":simbot-quantcat:simbot-quantcat-common"))
     api(project(":simbot-cores:simbot-core"))

diff --git a/simbot-cores/simbot-core-spring-boot-starter/build.gradle.kts b/simbot-cores/simbot-core-spring-boot-starter/build.gradle.kts
@@ -4,7 +4,7 @@
  *     Project    https://github.com/simple-robot/simpler-robot
  *     Email      ForteScarlet@163.com
  *
- *     This file is part of the Simple Robot Library.
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
@@ -44,6 +44,7 @@ kotlin {
 
 dependencies {
     implementation(platform(libs.spring.boot.v3.dependencies))
+    implementation(project(":simbot-logger"))
 
     compileOnly(project(":simbot-commons:simbot-common-annotations"))
     api(project(":simbot-quantcat:simbot-quantcat-common"))

diff --git a/simbot-cores/simbot-core/build.gradle.kts b/simbot-cores/simbot-core/build.gradle.kts
@@ -70,8 +70,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":simbot-commons:simbot-common-annotations"))
-                api(project(":simbot-commons:simbot-common-collection"))
+                implementation(project(":simbot-commons:simbot-common-annotations"))
+                implementation(project(":simbot-commons:simbot-common-collection"))
 
                 api(project(":simbot-api"))
                 api(libs.kotlinx.coroutines.core)
@@ -88,7 +88,7 @@ kotlin {
 
         jvmMain.dependencies {
             compileOnly(project(":simbot-commons:simbot-common-annotations"))
-            compileOnly(project(":simbot-commons:simbot-common-collection"))
+            // compileOnly(project(":simbot-commons:simbot-common-collection"))
         }
 
         jvmTest {

diff --git a/simbot-cores/simbot-core/src/jvmMain/java/module-info.java b/simbot-cores/simbot-core/src/jvmMain/java/module-info.java
@@ -2,7 +2,7 @@
     requires kotlin.stdlib;
     requires transitive simbot.api;
     requires static simbot.common.annotations;
-    requires static simbot.common.collection;
+    requires transitive simbot.common.collection;
     requires kotlinx.coroutines.core;
 
     exports love.forte.simbot.core.application;