diff --git a/.github/workflows/deploy-maven-central.yml b/.github/workflows/deploy-maven-central.yml index b484fbe..225f0d1 100644 --- a/.github/workflows/deploy-maven-central.yml +++ b/.github/workflows/deploy-maven-central.yml @@ -26,9 +26,6 @@ jobs: java-version: '17' distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v2 - - name: Determine version from branch id: version run: | diff --git a/.idea/artifacts/kotlin_plugin_js_1_3_0.xml b/.idea/artifacts/kotlin_plugin_js_1_3_0.xml new file mode 100644 index 0000000..11df68e --- /dev/null +++ b/.idea/artifacts/kotlin_plugin_js_1_3_0.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/kotlin-plugin/build/libs + + + + + \ No newline at end of file diff --git a/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml b/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml new file mode 100644 index 0000000..e8cc8fa --- /dev/null +++ b/.idea/artifacts/kotlin_plugin_jvm_1_3_0.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/kotlin-plugin/build/libs + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 04967d1..acc3636 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,6 @@ plugins { kotlin("multiplatform") version "2.0.21" apply false kotlin("jvm") version "2.0.21" apply false application - `maven-publish` signing id("io.github.gradle-nexus.publish-plugin") version "1.3.0" id("com.vanniktech.maven.publish") version "0.29.0" @@ -14,7 +13,7 @@ object Conf { const val GROUP = "net.kigawa" // Base version - will be modified based on branch name if available - const val BASE_VERSION = "1.2.1" + const val BASE_VERSION = "1.3.0" } // Determine version based on branch name diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index dbf13f7..79d9b4c 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "net.kigawa" -version = "1.0.0" +version = "1.3.0" repositories { gradlePluginPortal() @@ -14,10 +14,16 @@ repositories { } gradlePlugin { + website.set("https://github.com/Code-Sakura/renlin-compiler") + vcsUrl.set("https://github.com/Code-Sakura/renlin-compiler.git") + plugins { create("renlinCompiler") { id = "net.kigawa.renlin-compiler" implementationClass = "net.kigawa.renlin.RenlinCompilerPlugin" + displayName = "Renlin Compiler Plugin" + description = "Kotlin Compiler Plugin for automatic value injection with @AutoFill annotation" + tags.set(listOf("kotlin", "compiler-plugin", "annotation")) } } } @@ -39,42 +45,34 @@ java { withJavadocJar() } -// Version from environment or project property -version = project.findProperty("version") as String? ?: "1.0.0" publishing { - publications { - register("mavenJava", MavenPublication::class) { - from(components["kotlin"]) - groupId = "net.kigawa" - artifactId = "renlin-compiler-gradle-plugin" + publications.withType { + pom { + name.set("Renlin Compiler Gradle Plugin") + description.set("Gradle plugin that enables automatic value injection for @AutoFill annotated parameters using Kotlin Compiler Plugin") + url.set("https://github.com/Code-Sakura/renlin-compiler") - pom { - name.set("Renlin Compiler Gradle Plugin") - description.set("Gradle plugin that enables automatic value injection for @AutoFill annotated parameters using Kotlin Compiler Plugin") - url.set("https://github.com/kigawa01/kcp-for-renlin") - - licenses { - license { - name.set("MIT License") - url.set("https://opensource.org/licenses/MIT") - } - } - - developers { - developer { - id.set("kigawa01") - name.set("kigawa") - email.set("kigawa.inbox@gmail.com") - } + licenses { + license { + name.set("MIT License") + url.set("https://opensource.org/licenses/MIT") } - - scm { - connection.set("scm:git:git://github.com/kigawa01/kcp-for-renlin.git") - developerConnection.set("scm:git:ssh://github.com:kigawa01/kcp-for-renlin.git") - url.set("https://github.com/kigawa01/kcp-for-renlin") + } + + developers { + developer { + id.set("kigawa01") + name.set("kigawa") + email.set("kigawa.inbox@gmail.com") } } + + scm { + connection.set("scm:git:https://github.com/Code-Sakura/renlin-compiler.git") + developerConnection.set("scm:git:https://github.com/Code-Sakura/renlin-compiler.git") + url.set("https://github.com/Code-Sakura/renlin-compiler") + } } } repositories { diff --git a/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt b/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt index 887ce52..efb1b26 100644 --- a/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt +++ b/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt @@ -50,7 +50,7 @@ class RenlinCompilerPlugin : KotlinCompilerPluginSupportPlugin { return SubpluginArtifact( groupId = "net.kigawa", artifactId = "kotlin-plugin", - version = "1.0.0", + version = "1.3.0", ) } } \ No newline at end of file diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 7dcd768..645c457 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -58,12 +58,28 @@ dependencies: "@types/node" "*" -"@types/estree@^1.0.5": +"@types/eslint-scope@^3.7.3": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" + integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.5": version "1.0.8" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e" integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w== -"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -644,7 +660,7 @@ engine.io@~6.6.0: engine.io-parser "~5.2.1" ws "~8.17.1" -enhanced-resolve@^5.17.1: +enhanced-resolve@^5.17.0: version "5.18.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44" integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww== @@ -1153,10 +1169,10 @@ karma-webpack@5.0.1: minimatch "^9.0.3" webpack-merge "^4.1.5" -karma@6.4.4: - version "6.4.4" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492" - integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w== +karma@6.4.3: + version "6.4.3" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8" + integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q== dependencies: "@colors/colors" "1.5.0" body-parser "^1.19.0" @@ -1188,13 +1204,6 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -kotlin-web-helpers@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286" - integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw== - dependencies: - format-util "^1.0.5" - loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -1303,10 +1312,10 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@10.7.3: - version "10.7.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752" - integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A== +mocha@10.7.0: + version "10.7.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a" + integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA== dependencies: ansi-colors "^4.1.3" browser-stdout "^1.3.1" @@ -1948,11 +1957,12 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723" integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg== -webpack@5.94.0: - version "5.94.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" - integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== +webpack@5.93.0: + version "5.93.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" + integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== dependencies: + "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" @@ -1961,7 +1971,7 @@ webpack@5.94.0: acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.1" + enhanced-resolve "^5.17.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" diff --git a/kotlin-plugin/build.gradle.kts b/kotlin-plugin/build.gradle.kts index 700262f..e45892d 100644 --- a/kotlin-plugin/build.gradle.kts +++ b/kotlin-plugin/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "net.kigawa" -version = "1.0.0" +version = "1.3.0" repositories { gradlePluginPortal() @@ -68,15 +68,13 @@ kotlin { } } -// Version from environment or project property -version = project.findProperty("version") as String? ?: "1.0.0" publishing { publications.withType { pom { name.set("Renlin AutoFill Annotation") description.set("Multiplatform annotation library for automatic parameter value injection, supporting both JVM and JavaScript") - url.set("https://github.com/kigawa01/kcp-for-renlin") + url.set("https://github.com/Code-Sakura/renlin-compiler") licenses { license { @@ -94,9 +92,9 @@ publishing { } scm { - connection.set("scm:git:git://github.com/kigawa01/kcp-for-renlin.git") - developerConnection.set("scm:git:ssh://github.com:kigawa01/kcp-for-renlin.git") - url.set("https://github.com/kigawa01/kcp-for-renlin") + connection.set("scm:git:https://github.com/Code-Sakura/renlin-compiler.git") + developerConnection.set("scm:git:https://github.com/Code-Sakura/renlin-compiler.git") + url.set("https://github.com/Code-Sakura/renlin-compiler") } } } diff --git a/sample-project/build.gradle.kts b/sample-project/build.gradle.kts index e3f2ee7..c9e2265 100644 --- a/sample-project/build.gradle.kts +++ b/sample-project/build.gradle.kts @@ -11,7 +11,7 @@ buildscript { plugins { kotlin("jvm") version "2.0.21" application - id("net.kigawa.renlin-compiler") version "1.0.0" + id("net.kigawa.renlin-compiler") version "1.3.0" } @@ -25,7 +25,7 @@ repositories { dependencies { implementation(kotlin("stdlib")) - implementation("net.kigawa:kotlin-plugin:1.0.0") + implementation("net.kigawa:kotlin-plugin:1.3.0") testImplementation(kotlin("test")) }