From ca63e7ce5a30fd43487f7f301d03a4909f646f7c Mon Sep 17 00:00:00 2001
From: Stepan Goncharov <sgoncharov@gradle.com>
Date: Sun, 9 Jul 2023 12:16:59 -0700
Subject: [PATCH] Forma Android v0.1.0 (#129)

---
 plugins/android/build.gradle.kts |  4 +---
 plugins/build.gradle.kts         | 40 +-------------------------------
 plugins/settings.gradle.kts      |  2 +-
 3 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/plugins/android/build.gradle.kts b/plugins/android/build.gradle.kts
index d7a908f..977d930 100644
--- a/plugins/android/build.gradle.kts
+++ b/plugins/android/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "tools.forma"
-version = "0.0.1"
+version = "0.1.0"
 
 tasks.named("compileKotlin", KotlinCompilationTask::class.java) {
     compilerOptions {
@@ -37,10 +37,8 @@ gradlePlugin {
             implementationClass = "tools.forma.android.plugin.FormaPlugin"
             tags.set(
                 listOf(
-                    "gradle",
                     "kotlin",
                     "android",
-                    "plugin",
                     "structure",
                     "dependencies",
                     "module",
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 667a751..2288e39 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -1,47 +1,9 @@
-import com.gradle.publish.PublishPlugin
-
 plugins {
     `kotlin-dsl`
-    id("com.gradle.plugin-publish") version "1.1.0" apply false
+    id("com.gradle.plugin-publish") version "1.2.0" apply false
 }
 
 class FormaRootConfigurationException(
     override val message: String,
     override val cause: Throwable? = null
 ) : Exception()
-
-subprojects {
-    plugins.whenPluginAdded {
-        when (this) {
-            is PublishPlugin -> registerPublishingTasks()
-        }
-    }
-}
-
-fun Project.registerPublishingTasks() {
-    /**
-     * Workaround from https://github.com/gradle/gradle/issues/1246
-     */
-    val pluginPublishKeysSetup = tasks.register("pluginPublishKeysSetup") {
-        doLast {
-            val key = System.getenv("GRADLE_PUBLISH_KEY")
-            val secret = System.getenv("GRADLE_PUBLISH_SECRET")
-
-            if (key == null || secret == null) throw GradleException(
-                "gradlePublishKey and/or gradlePublishSecret are not defined environment variables"
-            )
-
-            System.setProperty("gradle.publish.key", key)
-            System.setProperty("gradle.publish.secret", secret)
-        }
-    }
-
-    tasks.named("publishPlugins").configure {
-        dependsOn(pluginPublishKeysSetup)
-    }
-}
-
-
-tasks.register("publishPluginsToMavenLocal") {
-    dependsOn(subprojects.map { "${it.path}:publishToMavenLocal" })
-}
diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts
index dfb4970..6ccbe62 100644
--- a/plugins/settings.gradle.kts
+++ b/plugins/settings.gradle.kts
@@ -4,5 +4,5 @@ pluginManagement {
 
 plugins {
     id("convention-dependencies")
-    id("tools.forma.includer") version "0.1.3"
+    id("tools.forma.includer") version "0.2.0"
 }