From aa607b8aca4976d898592cc91fa60895197f2d93 Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 03:55:49 +0900 Subject: [PATCH 1/9] chore: fix repository bug --- gradle.properties | 2 +- .../kotlin/plugin/ComposableReferenceSuppressorPlugin.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 512fea9..071dd0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ RELEASE_SIGNING_ENABLED=true GROUP=land.sungbin POM_ARTIFACT_ID=composable.reference.suppressor.plugin -VERSION_NAME=1.0.1 +VERSION_NAME=1.0.2 POM_NAME=composable-function-reference-diagnostic-suppressor POM_DESCRIPTION=COMPOSABLE_FUNCTION_REFERENCE diagnostic suppression Kotlin compiler plugin diff --git a/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt b/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt index 93f2841..5e1fdc4 100644 --- a/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt +++ b/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt @@ -10,15 +10,18 @@ package plugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.maven import org.gradle.kotlin.dsl.repositories class ComposableReferenceSuppressorPlugin : Plugin { override fun apply(project: Project) { with(project) { repositories { - maven { - url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } + add( + maven( + url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") + ) + ) } dependencies { add( From e4da8fad0566e5ec3d2f7c21fc6cea8cf301ce2a Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 05:05:08 +0900 Subject: [PATCH 2/9] chore: fix repository bug (2) --- .../kotlin/plugin/ComposableReferenceSuppressorPlugin.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt b/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt index 5e1fdc4..c448c85 100644 --- a/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt +++ b/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt @@ -11,18 +11,11 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.maven -import org.gradle.kotlin.dsl.repositories class ComposableReferenceSuppressorPlugin : Plugin { override fun apply(project: Project) { with(project) { - repositories { - add( - maven( - url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") - ) - ) - } + repositories.maven(uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")) dependencies { add( org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME, From 4f992e9efcc6282d64ff7e75e935e3e86ee3dfc9 Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 20:04:26 +0900 Subject: [PATCH 3/9] chore: bump artifact version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 071dd0d..43b7087 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ RELEASE_SIGNING_ENABLED=true GROUP=land.sungbin POM_ARTIFACT_ID=composable.reference.suppressor.plugin -VERSION_NAME=1.0.2 +VERSION_NAME=1.0.4 POM_NAME=composable-function-reference-diagnostic-suppressor POM_DESCRIPTION=COMPOSABLE_FUNCTION_REFERENCE diagnostic suppression Kotlin compiler plugin From ad8fe250f5ad9ee0b523e81df539259b3d269974 Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 20:04:55 +0900 Subject: [PATCH 4/9] refactor: change repository style --- .../kotlin/plugin/ComposableReferenceSuppressorPlugin.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt b/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt index c448c85..d399cc7 100644 --- a/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt +++ b/src/main/kotlin/plugin/ComposableReferenceSuppressorPlugin.kt @@ -11,11 +11,16 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.maven +import org.gradle.kotlin.dsl.repositories class ComposableReferenceSuppressorPlugin : Plugin { override fun apply(project: Project) { with(project) { - repositories.maven(uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")) + repositories { + maven( + url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") + ) + } dependencies { add( org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME, From 19736377b88e9eebfc057224b8a680c840b24f0b Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 21:07:54 +0900 Subject: [PATCH 5/9] chore: add missing kapt --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 01a0615..192221a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,11 +35,11 @@ repositories { // [The latest version of Compose Compiler] // https://maven.pkg.jetbrains.space/public/p/compose/dev/org/jetbrains/compose/compiler/compiler/ dependencies { - compileOnly(gradleApi()) compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.20") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") implementation("org.jetbrains.compose.compiler:compiler:1.3.2-alpha01") compileOnly("com.google.auto.service:auto-service:1.0.1") + kapt("com.google.auto.service:auto-service:1.0.1") } tasks.test { From 064f6dd1537682ad0593405148e9cbc36bb11d60 Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 21:08:03 +0900 Subject: [PATCH 6/9] chore: bump artifact version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 43b7087..59627d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ RELEASE_SIGNING_ENABLED=true GROUP=land.sungbin POM_ARTIFACT_ID=composable.reference.suppressor.plugin -VERSION_NAME=1.0.4 +VERSION_NAME=1.0.5 POM_NAME=composable-function-reference-diagnostic-suppressor POM_DESCRIPTION=COMPOSABLE_FUNCTION_REFERENCE diagnostic suppression Kotlin compiler plugin From 47284d4110dfb114d3bb7ca7f50f773f20655b02 Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 21:21:21 +0900 Subject: [PATCH 7/9] update readme --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c49661..f71b145 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,18 @@ This Kotlin compiler plugin was developed to avoid this limitation. | ![maven-central](https://img.shields.io/badge/maven--central-1.0.x-brightgreen) | ![kotlin-compatibility](https://img.shields.io/badge/kotlin%20compatibility-1.7.20-blue) | ```kotlin -plugins { - id("land.sungbin.composable.reference.suppressor") version "$version" +repositories { + maven { + // we need a dev repository to keep the Compose Compiler always up-to-date. + url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } +} + +dependencies { + add( + org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME, + "land.sungbin:composable.reference.suppressor.plugin:${version}", + ) } ``` From 7b41d9dd64a924d2d8c77667e5326e0cec028597 Mon Sep 17 00:00:00 2001 From: Ji Sungbin Date: Thu, 6 Oct 2022 21:21:52 +0900 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f71b145..1a17033 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ repositories { dependencies { add( org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME, - "land.sungbin:composable.reference.suppressor.plugin:${version}", + "land.sungbin:composable.reference.suppressor.plugin:${version}" ) } ``` From f1568aedd2afedf219d143e78f0d223b92d1b9e7 Mon Sep 17 00:00:00 2001 From: jisungbin Date: Thu, 6 Oct 2022 21:24:11 +0900 Subject: [PATCH 9/9] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a17033..d74d036 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ This Kotlin compiler plugin was developed to avoid this limitation. ```kotlin repositories { maven { - // we need a dev repository to keep the Compose Compiler always up-to-date. + // We need the JB repository to get the Compose Compiler the latest version url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } }