Merge pull request #18 from 2BAB/dev_v2

Fix the id("xxx") artifacts publish
2BAB · Aug 26, 2022 · 530eae5 · 530eae5
2 parents 937ee43 + 41a699b
commit 530eae5
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 36 deletions.
diff --git 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/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"
     }
 
 }
diff --git 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<MavenPublication>("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
-    }
 }
diff --git a/publish.sh b/publish.sh
@@ -1 +1 @@
-./gradlew clean :plugin:publishAllPublicationsToSonatypeRepository :plugin:releaseArtifactsToGithub
+./gradlew clean :scratchpaper:publishAllPublicationsToSonatypeRepository :scratchpaper:releaseArtifactsToGithub
diff --git a/publish_to_local.sh b/publish_to_local.sh
@@ -1 +1 @@
-./gradlew clean :plugin:assemble :plugin:publishToMavenLocal
+./gradlew clean :scratchpaper:assemble :scratchpaper:publishToMavenLocal
diff --git 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"))
         }
     }
 }
diff --git a/plugin/.gitignore → scratchpaper/.gitignore b/plugin/.gitignore → scratchpaper/.gitignore
diff --git a/plugin/build.gradle.kts → scratchpaper/build.gradle.kts b/plugin/build.gradle.kts → 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/...xx2bab/scratchpaper/IconOverlayContent.kt → ...xx2bab/scratchpaper/IconOverlayContent.kt b/...xx2bab/scratchpaper/IconOverlayContent.kt → ...xx2bab/scratchpaper/IconOverlayContent.kt
diff --git a/...e/xx2bab/scratchpaper/IconOverlayStyle.kt → ...e/xx2bab/scratchpaper/IconOverlayStyle.kt b/...e/xx2bab/scratchpaper/IconOverlayStyle.kt → ...e/xx2bab/scratchpaper/IconOverlayStyle.kt
diff --git a/...bab/scratchpaper/ScratchPaperExtension.kt → ...bab/scratchpaper/ScratchPaperExtension.kt b/...bab/scratchpaper/ScratchPaperExtension.kt → ...bab/scratchpaper/ScratchPaperExtension.kt
diff --git a/...xx2bab/scratchpaper/ScratchPaperPlugin.kt → ...xx2bab/scratchpaper/ScratchPaperPlugin.kt b/...xx2bab/scratchpaper/ScratchPaperPlugin.kt → ...xx2bab/scratchpaper/ScratchPaperPlugin.kt
diff --git a/...2bab/scratchpaper/icon/Aapt2Operations.kt → ...2bab/scratchpaper/icon/Aapt2Operations.kt b/...2bab/scratchpaper/icon/Aapt2Operations.kt → ...2bab/scratchpaper/icon/Aapt2Operations.kt
diff --git a/...cratchpaper/icon/AdaptiveIconProcessor.kt → ...cratchpaper/icon/AdaptiveIconProcessor.kt b/...cratchpaper/icon/AdaptiveIconProcessor.kt → ...cratchpaper/icon/AdaptiveIconProcessor.kt
diff --git a/...tchpaper/icon/AddIconOverlayTaskAction.kt → ...tchpaper/icon/AddIconOverlayTaskAction.kt b/...tchpaper/icon/AddIconOverlayTaskAction.kt → ...tchpaper/icon/AddIconOverlayTaskAction.kt
diff --git a/...ab/scratchpaper/icon/BaseIconProcessor.kt → ...ab/scratchpaper/icon/BaseIconProcessor.kt b/...ab/scratchpaper/icon/BaseIconProcessor.kt → ...ab/scratchpaper/icon/BaseIconProcessor.kt
diff --git a/...b/scratchpaper/icon/IconProcessorParam.kt → ...b/scratchpaper/icon/IconProcessorParam.kt b/...b/scratchpaper/icon/IconProcessorParam.kt → ...b/scratchpaper/icon/IconProcessorParam.kt
diff --git a/...scratchpaper/icon/RegularIconProcessor.kt → ...scratchpaper/icon/RegularIconProcessor.kt b/...scratchpaper/icon/RegularIconProcessor.kt → ...scratchpaper/icon/RegularIconProcessor.kt
diff --git a/...x2bab/scratchpaper/utils/CacheLocation.kt → ...x2bab/scratchpaper/utils/CacheLocation.kt b/...x2bab/scratchpaper/utils/CacheLocation.kt → ...x2bab/scratchpaper/utils/CacheLocation.kt
diff --git a/...in/me/xx2bab/scratchpaper/utils/Logger.kt → ...in/me/xx2bab/scratchpaper/utils/Logger.kt b/...in/me/xx2bab/scratchpaper/utils/Logger.kt → ...in/me/xx2bab/scratchpaper/utils/Logger.kt
diff --git 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") {