build: spilt kotlinx & stdlib

MineBuilders · Jan 23, 2025 · b8d9311 · b8d9311
1 parent 2b855c8
commit b8d9311
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml
@@ -59,12 +59,23 @@ jobs:
             fi
           done
 
+      - name: Upload artifact (kotlinx)
+        uses: actions/upload-artifact@v4
+        with:
+          name: kotlinx-lib-${{ github.sha }}
+          path: plugin/kotlinx/build/libs/*.jar
+
       # TODO: upload artifacts dynamically
-      - name: Upload artifact (core)
+#      - name: Upload artifact (<MODULE_NAME>)
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: kotlinx-<MODULE_NAME>-lib-${{ github.sha }}
+#          path: plugin/<MODULE_NAME>/build/libs/*.jar
+      - name: Upload artifact (stdlib)
         uses: actions/upload-artifact@v4
         with:
-          name: kotlinx-core-lib-${{ github.sha }}
-          path: plugin/core/build/libs/*.jar
+          name: kotlinx-stdlib-lib-${{ github.sha }}
+          path: plugin/stdlib/build/libs/*.jar
       - name: Upload artifact (compose)
         uses: actions/upload-artifact@v4
         with:

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.plugin.core)
+    compileOnly(projects.plugin.kotlinx)
+    compileOnly(projects.plugin.stdlib)
     compileOnly(projects.plugin.compose)
 }
 

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -26,7 +26,7 @@ fun basePluginDescriptor(names: Names) = """
       "entrance": "${basePluginClassPackage(names)}.${basePluginClassName(names)}",
       "name": "kotlinx-${names.kebab}-lib",
       "description": "${
-          if (names.lodash == "core") "Kotlin-style Extension Library and Shared Standard Library for Allay Server"
+          if (names.lodash == "kotlinx") "Kotlin-style Extension Library for Allay Server"
           else "Kotlinx Shared Library for Allay Server -- ${names.upperCamel}"
       }",
       "authors": [

diff --git a/plugin/kotlinx/build.gradle.kts b/plugin/kotlinx/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+    api(projects.core)
+}
diff --git a/plugin/core/build.gradle.kts → plugin/stdlib/build.gradle.kts b/plugin/core/build.gradle.kts → plugin/stdlib/build.gradle.kts
@@ -1,6 +1,4 @@
 dependencies {
-    api(projects.core)
-
     api(kotlin("stdlib"))
     api(kotlin("stdlib-jdk7"))
     api(kotlin("stdlib-jdk8"))

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -35,7 +35,7 @@ dependencyResolutionManagement {
     }
 }
 
-val sharedDeps = arrayOf("core", "compose")
+val sharedDeps = arrayOf("kotlinx", "stdlib", "compose")
 include(":core")
 include(":plugin")
 include(":example")