From d532a9ffa19d9afbd4d00cf6a5be27242cc8d18b Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 1 Dec 2020 09:47:00 +0800
Subject: [PATCH] Fix publishing keys

---
 buildSrc/src/main/kotlin/Versions.kt            |  2 +-
 tools/gradle-plugin/src/BuildMiraiPluginTask.kt |  3 +--
 tools/gradle-plugin/src/VersionConstants.kt     |  2 +-
 tools/gradle-plugin/src/publishing.kt           | 14 ++++++++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index d60449256..ea3f9be23 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -11,7 +11,7 @@
 
 object Versions {
     const val core = "1.3.3"
-    const val console = "1.1.0-dev-33"
+    const val console = "1.1.0-dev-36"
     const val consoleGraphical = "0.0.7"
     const val consoleTerminal = console
 
diff --git a/tools/gradle-plugin/src/BuildMiraiPluginTask.kt b/tools/gradle-plugin/src/BuildMiraiPluginTask.kt
index 53227973f..0361e0331 100644
--- a/tools/gradle-plugin/src/BuildMiraiPluginTask.kt
+++ b/tools/gradle-plugin/src/BuildMiraiPluginTask.kt
@@ -3,7 +3,6 @@ package net.mamoe.mirai.console.gradle
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputFile
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import java.io.File
 
@@ -19,7 +18,7 @@ public open class BuildMiraiPluginTask : ShadowJar() {
     /**
      * ShadowJar 打包结果
      */
-    @get:OutputFile
+    @get:Internal
     public val output: File
         get() = outputs.files.singleFile
 }
\ No newline at end of file
diff --git a/tools/gradle-plugin/src/VersionConstants.kt b/tools/gradle-plugin/src/VersionConstants.kt
index 810c58f66..e711e916d 100644
--- a/tools/gradle-plugin/src/VersionConstants.kt
+++ b/tools/gradle-plugin/src/VersionConstants.kt
@@ -10,6 +10,6 @@
 package net.mamoe.mirai.console.gradle
 
 internal object VersionConstants {
-    const val CONSOLE_VERSION = "1.1.0-dev-33" // value is written here automatically during build
+    const val CONSOLE_VERSION = "1.1.0-dev-36" // value is written here automatically during build
     const val CORE_VERSION = "1.3.3" // value is written here automatically during build
 }
\ No newline at end of file
diff --git a/tools/gradle-plugin/src/publishing.kt b/tools/gradle-plugin/src/publishing.kt
index db01b23de..1e67bd632 100644
--- a/tools/gradle-plugin/src/publishing.kt
+++ b/tools/gradle-plugin/src/publishing.kt
@@ -34,9 +34,11 @@ private fun Project.findPropertySmart(propName: String): String? {
         ?: System.getenv(propName)
 }
 
+private class PropertyNotFoundException(message: String) : RuntimeException(message)
+
 private fun Project.findPropertySmartOrFail(propName: String): String {
     return findPropertySmart(propName)
-        ?: error("[Mirai Console] Cannot find property for publication: '$propName'. Please check your 'mirai' configuration.")
+        ?: throw PropertyNotFoundException("[Mirai Console] Cannot find property for publication: '$propName'. Please check your 'mirai' configuration.")
 }
 
 internal fun Project.configurePublishing() {
@@ -48,7 +50,15 @@ internal fun Project.configurePublishing() {
         registerMavenPublications(it, isSingleTarget)
     }
 
-    registerBintrayPublish()
+    try {
+        registerBintrayPublish()
+    } catch (e: PropertyNotFoundException) {
+        logger.warn(e.message)
+        tasks.filter { it.group == "mirai" }
+            .filter { it.name.startsWith("publishPlugin") }
+            .forEach { it.enabled = false }
+        logger.warn("Publishing tasks disabled.")
+    }
 }
 
 private inline fun <reified T : Task> TaskContainer.getSingleTask(): T = filterIsInstance<T>().single()