diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 7671765..dac6aee 100644 --- 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 () +# uses: actions/upload-artifact@v4 +# with: +# name: kotlinx--lib-${{ github.sha }} +# path: plugin//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 index 941c3cf..00ba388 100644 --- 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 index 92ef69c..cffc49d 100644 --- 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 new file mode 100644 index 0000000..a5a3ad4 --- /dev/null +++ b/plugin/kotlinx/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + api(projects.core) +} diff --git a/plugin/core/build.gradle.kts b/plugin/stdlib/build.gradle.kts similarity index 89% rename from plugin/core/build.gradle.kts rename to plugin/stdlib/build.gradle.kts index 0c47859..f322999 100644 --- a/plugin/core/build.gradle.kts +++ b/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 index ba5b658..e9273bc 100644 --- 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")