From fd94c51631307a9488d06b1be138417e9b4db4f2 Mon Sep 17 00:00:00 2001 From: 2BAB Date: Fri, 26 Aug 2022 20:21:31 +0800 Subject: [PATCH 1/3] refactor: change the module name to be same as artifact id to avoid strange publish problem that the id will be using the one of module name and a bit troublesome to change that --- {plugin => scratchpaper}/.gitignore | 0 {plugin => scratchpaper}/build.gradle.kts | 1 + .../src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayContent.kt | 0 .../src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayStyle.kt | 0 .../main/kotlin/me/xx2bab/scratchpaper/ScratchPaperExtension.kt | 0 .../src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperPlugin.kt | 0 .../main/kotlin/me/xx2bab/scratchpaper/icon/Aapt2Operations.kt | 0 .../kotlin/me/xx2bab/scratchpaper/icon/AdaptiveIconProcessor.kt | 0 .../me/xx2bab/scratchpaper/icon/AddIconOverlayTaskAction.kt | 0 .../main/kotlin/me/xx2bab/scratchpaper/icon/BaseIconProcessor.kt | 0 .../kotlin/me/xx2bab/scratchpaper/icon/IconProcessorParam.kt | 0 .../kotlin/me/xx2bab/scratchpaper/icon/RegularIconProcessor.kt | 0 .../main/kotlin/me/xx2bab/scratchpaper/utils/CacheLocation.kt | 0 .../src/main/kotlin/me/xx2bab/scratchpaper/utils/Logger.kt | 0 14 files changed, 1 insertion(+) rename {plugin => scratchpaper}/.gitignore (100%) rename {plugin => scratchpaper}/build.gradle.kts (95%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayContent.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayStyle.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperExtension.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperPlugin.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/icon/Aapt2Operations.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/icon/AdaptiveIconProcessor.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/icon/AddIconOverlayTaskAction.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/icon/BaseIconProcessor.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/icon/IconProcessorParam.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/icon/RegularIconProcessor.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/utils/CacheLocation.kt (100%) rename {plugin => scratchpaper}/src/main/kotlin/me/xx2bab/scratchpaper/utils/Logger.kt (100%) diff --git a/plugin/.gitignore b/scratchpaper/.gitignore similarity index 100% rename from plugin/.gitignore rename to scratchpaper/.gitignore diff --git a/plugin/build.gradle.kts b/scratchpaper/build.gradle.kts similarity index 95% rename from plugin/build.gradle.kts rename to scratchpaper/build.gradle.kts index d4c8276..62898e3 100644 --- a/plugin/build.gradle.kts +++ b/scratchpaper/build.gradle.kts @@ -21,6 +21,7 @@ gradlePlugin { create("scratchpaper") { id = "me.2bab.scratchpaper" implementationClass = "me.xx2bab.scratchpaper.ScratchPaperPlugin" + displayName = "me.2bab.scratchpaper" } } } diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayContent.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayContent.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayContent.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayContent.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayStyle.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayStyle.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayStyle.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/IconOverlayStyle.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperExtension.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperExtension.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperExtension.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperExtension.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperPlugin.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperPlugin.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperPlugin.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/ScratchPaperPlugin.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/Aapt2Operations.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/Aapt2Operations.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/Aapt2Operations.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/Aapt2Operations.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/AdaptiveIconProcessor.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/AdaptiveIconProcessor.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/AdaptiveIconProcessor.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/AdaptiveIconProcessor.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/AddIconOverlayTaskAction.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/AddIconOverlayTaskAction.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/AddIconOverlayTaskAction.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/AddIconOverlayTaskAction.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/BaseIconProcessor.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/BaseIconProcessor.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/BaseIconProcessor.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/BaseIconProcessor.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/IconProcessorParam.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/IconProcessorParam.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/IconProcessorParam.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/IconProcessorParam.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/RegularIconProcessor.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/RegularIconProcessor.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/icon/RegularIconProcessor.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/icon/RegularIconProcessor.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/utils/CacheLocation.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/utils/CacheLocation.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/utils/CacheLocation.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/utils/CacheLocation.kt diff --git a/plugin/src/main/kotlin/me/xx2bab/scratchpaper/utils/Logger.kt b/scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/utils/Logger.kt similarity index 100% rename from plugin/src/main/kotlin/me/xx2bab/scratchpaper/utils/Logger.kt rename to scratchpaper/src/main/kotlin/me/xx2bab/scratchpaper/utils/Logger.kt From 3f07bf65b74300edbc0ab899fa21a94758ceb73a Mon Sep 17 00:00:00 2001 From: 2BAB Date: Fri, 26 Aug 2022 20:22:45 +0800 Subject: [PATCH 2/3] release: changed release flow accordingly, bump version to 3.2.1 We suppose to support the id("xxx") import approach since 3.2.0, now I think should finally make it work --- buildSrc/src/main/kotlin/BuildConfig.kt | 2 +- .../kotlin/maven-central-publish.gradle.kts | 39 +++++-------------- publish.sh | 2 +- publish_to_local.sh | 2 +- settings.gradle.kts | 2 +- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index ff974c3..7376f5a 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -1,7 +1,7 @@ object BuildConfig { object Versions { - const val scratchPaperVersion = "3.2.0" + const val scratchPaperVersion = "3.2.1" } } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/maven-central-publish.gradle.kts b/buildSrc/src/main/kotlin/maven-central-publish.gradle.kts index e15ed70..ddc896a 100644 --- a/buildSrc/src/main/kotlin/maven-central-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/maven-central-publish.gradle.kts @@ -53,26 +53,6 @@ val username = "2BAB" publishing { - - publications { - create("SPPlugin") { - groupId = groupName - artifactId = projectName - version = BuildConfig.Versions.scratchPaperVersion - artifact(javadocJar.get()) - from(components["java"]) - pom { - // Description - name.set(projectName) - - // Archive - groupId = groupName - artifactId = projectName - version = BuildConfig.Versions.scratchPaperVersion - } - } - } - // Configure MavenCentral repository repositories { maven { @@ -101,13 +81,18 @@ signing { afterEvaluate { publishing.publications.all { val publicationName = this.name - println("maven publication: " + this.name) (this as MavenPublication).apply { - if (publicationName == "pluginMaven" || publicationName == "scratchpaperPluginMarkerMaven") { - artifact(javadocJar.get()) + if (publicationName == "pluginMaven") { + groupId = groupName + artifactId = projectName } + version = BuildConfig.Versions.scratchPaperVersion + artifact(javadocJar.get()) + pom { - name.set(projectName) + if (publicationName == "pluginMaven") { + name.set(project.name) + } description.set(mavenDesc) url.set(siteUrl) @@ -134,10 +119,4 @@ afterEvaluate { } } } -} - -tasks.whenTaskAdded { - if (this.name.startsWith("publishPluginMavenPublication")) { - this.enabled = false - } } \ No newline at end of file diff --git a/publish.sh b/publish.sh index 5315098..db33f0c 100755 --- a/publish.sh +++ b/publish.sh @@ -1 +1 @@ -./gradlew clean :plugin:publishAllPublicationsToSonatypeRepository :plugin:releaseArtifactsToGithub \ No newline at end of file +./gradlew clean :scratchpaper:publishAllPublicationsToSonatypeRepository :scratchpaper:releaseArtifactsToGithub \ No newline at end of file diff --git a/publish_to_local.sh b/publish_to_local.sh index 28bacfb..74b0299 100755 --- a/publish_to_local.sh +++ b/publish_to_local.sh @@ -1 +1 @@ -./gradlew clean :plugin:assemble :plugin:publishToMavenLocal \ No newline at end of file +./gradlew clean :scratchpaper:assemble :scratchpaper:publishToMavenLocal diff --git a/settings.gradle.kts b/settings.gradle.kts index 7c3cfcf..d205d05 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,7 @@ dependencyResolutionManagement { } } -include(":plugin", ":functional-test") +include(":scratchpaper", ":functional-test") //if (file("../../Polyfill").run { exists() && isDirectory }) { // includeBuild("../../Polyfill") { From 41a699bfdc50d565bbcd470814c8f01dcfe88f3d Mon Sep 17 00:00:00 2001 From: 2BAB Date: Fri, 26 Aug 2022 20:40:03 +0800 Subject: [PATCH 3/3] fix: change the module name for testing scripts --- .github/workflows/ci.yml | 2 +- sample/settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66a3220..7484dd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: restore-keys: | ${{ runner.os }}-${{ github.job }}- - run: | - ./gradlew :plugin:test + ./gradlew :scratchpaper:test functional-tests: name: Functional tests runs-on: ubuntu-latest diff --git a/sample/settings.gradle.kts b/sample/settings.gradle.kts index 9e3507a..ba4f7c5 100644 --- a/sample/settings.gradle.kts +++ b/sample/settings.gradle.kts @@ -52,7 +52,7 @@ if (enabledCompositionBuild) { includeBuild(externalDependencyBaseDir) { dependencySubstitution { substitute(module("me.2bab:scratchpaper")) - .with(project(":plugin")) + .with(project(":scratchpaper")) } } } \ No newline at end of file