From 811cdfc6be361644d6249bc2354231d684d4117e Mon Sep 17 00:00:00 2001
From: James Hamilton <james.hamilton@guardsquare.com>
Date: Thu, 27 May 2021 22:59:17 +0200
Subject: [PATCH] Fix Gradle Plugin publication config (#167)

---
 gradle-plugin/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
index 05c5f204..d3dee857 100644
--- a/gradle-plugin/build.gradle
+++ b/gradle-plugin/build.gradle
@@ -17,7 +17,7 @@ def agpVersion = '4.1.0'
 
 gradlePlugin {
     plugins {
-        simplePlugin {
+        proguardPlugin {
             id = 'proguard'
             implementationClass = 'proguard.gradle.plugin.ProGuardPlugin'
         }
@@ -103,9 +103,11 @@ afterEvaluate {
           and must not be automatically published.
         - "<project.name>" is created by ProGuard custom logic
           and should have its artifact ID adjusted.
+        - we also disable publishing of plugin markers.
      */
     tasks.withType(AbstractPublishToMaven).matching { task ->
-        task.publication.name == 'pluginMaven'
+        task.publication.name == 'pluginMaven' ||
+            task.name =~ /^publish(.*)PluginMarkerMavenPublicationTo(GithubRepository|MavenLocal|SonatypeRepository)$/
     } each {task ->
         task.enabled = false
     }