feat: rollback breaking changes (#17)

entrypointkr · web-flow · commit b80868f30831 · 2020-07-02T20:43:24.000+09:00
Sorry about the breaking change again, the change is reverted. You can use 1.4+ if you used 1.2.4, or go to 2.0+ if you used 1.3.1.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ An intelligent Gradle plugin used to develop plugins for Spigot, Bungeecord and
 - [The Spigot plugin](docs/spigot_plugin.md)
 - [The Bungeecord plugin](docs/bungeecord_plugin.md)
 - [The Nukkit plugin](docs/nukkit_plugin.md)
-- [Sample](https://github.com/EntryPointKR/SpigradleSample)
+- [Sample](https://github.com/spigradle/spigradle-sample)
 
 ## Plugins
 
@@ -37,7 +37,7 @@ An intelligent Gradle plugin used to develop plugins for Spigot, Bungeecord and
 
 [Documentation](docs/spigot_plugin.md)
 
-[Demo](https://github.com/EntryPointKR/SpigradleSample/tree/master/spigot)
+[Demo](https://github.com/spigradle/spigradle-sample/tree/master/spigot)
 
 Groovy DSL
 
@@ -100,7 +100,7 @@ apply(plugin = "kr.entree.spigradle")
 
 [Documentation](docs/spigot_plugin.md)
 
-[Demo](https://github.com/EntryPointKR/SpigradleSample/tree/master/bungeecord)
+[Demo](https://github.com/spigradle/spigradle-sample/tree/master/bungeecord)
 
 Groovy DSL
 
@@ -163,7 +163,7 @@ apply(plugin = "kr.entree.spigradle.bungee")
 
 [Documentation](docs/nukkit_plugin.md)
 
-[Demo](https://github.com/EntryPointKR/SpigradleSample/tree/master/nukkit)
+[Demo](https://github.com/spigradle/spigradle-sample/tree/master/nukkit)
 
 Groovy DSL
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,7 +35,6 @@ gradlePlugin {
 }
 
 repositories {
-    mavenCentral()
     jcenter()
     gradlePluginPortal()
     maven { setUrl("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
@@ -52,6 +51,7 @@ dependencies {
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
     implementation("org.ow2.asm:asm:8.0.1")
     implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.7")
+    implementation("kr.entree:spigradle-annotations:1.2.0")
     kapt("com.google.auto.service:auto-service:1.0-rc7")
     compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
diff --git a/buildSrc/spigradle-build.gradle.kts b/buildSrc/spigradle-build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 
 repositories {
     jcenter()
-    mavenCentral()
     gradlePluginPortal()
 }
 
diff --git a/buildSrc/src/main/kotlin/spigradle-docs.gradle.kts b/buildSrc/src/main/kotlin/spigradle-docs.gradle.kts
@@ -13,7 +13,7 @@ tasks {
             jdkVersion = 8
             sourceLink {
                 path = "src/main/kotlin"
-                url = "https://github.com/EntryPointKR/Spigradle/tree/master/src/main/kotlin"
+                url = "https://github.com/spigradle/spigradle/tree/master/src/main/kotlin"
                 lineSuffix = "#L"
             }
             externalDocumentationLink {
diff --git a/buildSrc/src/main/kotlin/spigradle-publish.gradle.kts b/buildSrc/src/main/kotlin/spigradle-publish.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     `maven-publish`
 }
 
-val spigradleVcsUrl = "https://github.com/EntryPointKR/Spigradle.git"
+val spigradleVcsUrl = "https://github.com/spigradle/spigradle.git"
 
 bintray {
     user = findProperty("bintray.publish.user")?.toString()
@@ -23,9 +23,9 @@ bintray {
         repo = "Spigradle"
         name = project.name
         desc = project.description
-        websiteUrl = "https://github.com/EntryPointKR/Spigradle"
-        githubRepo = "https://github.com/EntryPointKR/Spigradle"
-        issueTrackerUrl = "https://github.com/EntryPointKR/Spigradle/issues"
+        websiteUrl = "https://github.com/spigradle/spigradle"
+        githubRepo = "https://github.com/spigradle/spigradle"
+        issueTrackerUrl = "https://github.com/spigradle/spigradle/issues"
         setLicenses("Apache-2.0")
         vcsUrl = spigradleVcsUrl
     }
@@ -70,7 +70,7 @@ publishing {
 }
 
 pluginBundle {
-    website = "https://github.com/EntryPointKR/Spigradle"
+    website = "https://github.com/spigradle/spigradle"
     vcsUrl = spigradleVcsUrl
     tags = listOf("minecraft", "paper", "spigot", "bukkit", "bungeecord", "nukkit", "nukkitX")
     fun formatDesc(name: String) = "An intelligent Gradle plugin for developing $name plugin."
diff --git a/docs/bungeecord_plugin.md b/docs/bungeecord_plugin.md
@@ -46,7 +46,7 @@ gradlew wrapper --gradle-version 6.4.1 --distribution-type all
 
 [comment]: <> (!! Do not edit this file but 'docs/templates' or 'docs/root-templates', See [CONTRIBUTING.md] !!)
 
-[Full Example Here](https://github.com/EntryPointKR/SpigradleSample/tree/master/bungeecord)
+[Full Example Here](https://github.com/spigradle/spigradle-sample/tree/master/bungeecord)
 
 Groovy DSL
 
diff --git a/docs/nukkit_plugin.md b/docs/nukkit_plugin.md
@@ -46,7 +46,7 @@ gradlew wrapper --gradle-version 6.4.1 --distribution-type all
 
 [comment]: <> (!! Do not edit this file but 'docs/templates' or 'docs/root-templates', See [CONTRIBUTING.md] !!)
 
-[Full Example Here](https://github.com/EntryPointKR/SpigradleSample/tree/master/nukkit)
+[Full Example Here](https://github.com/spigradle/spigradle-sample/tree/master/nukkit)
 
 Groovy DSL
 
diff --git a/docs/root-templates/template_README.md b/docs/root-templates/template_README.md
@@ -21,15 +21,15 @@ An intelligent Gradle plugin used to develop plugins for Spigot, Bungeecord and
 - [The Spigot plugin](docs/spigot_plugin.md)
 - [The Bungeecord plugin](docs/bungeecord_plugin.md)
 - [The Nukkit plugin](docs/nukkit_plugin.md)
-- [Sample](https://github.com/EntryPointKR/SpigradleSample)
+- [Sample](https://github.com/spigradle/spigradle-sample)
 
 ## Plugins
 
 ### Spigot
 
 [Documentation](docs/spigot_plugin.md)
 
-[Demo](https://github.com/EntryPointKR/SpigradleSample/tree/master/spigot)
+[Demo](https://github.com/spigradle/spigradle-sample/tree/master/spigot)
 
 Groovy DSL
 
@@ -90,7 +90,7 @@ apply(plugin = "kr.entree.spigradle")
 
 [Documentation](docs/spigot_plugin.md)
 
-[Demo](https://github.com/EntryPointKR/SpigradleSample/tree/master/bungeecord)
+[Demo](https://github.com/spigradle/spigradle-sample/tree/master/bungeecord)
 
 Groovy DSL
 
@@ -151,7 +151,7 @@ apply(plugin = "kr.entree.spigradle.bungee")
 
 [Documentation](docs/nukkit_plugin.md)
 
-[Demo](https://github.com/EntryPointKR/SpigradleSample/tree/master/nukkit)
+[Demo](https://github.com/spigradle/spigradle-sample/tree/master/nukkit)
 
 Groovy DSL
 
diff --git a/docs/spigot_plugin.md b/docs/spigot_plugin.md
@@ -52,7 +52,7 @@ gradlew wrapper --gradle-version 6.4.1 --distribution-type all
 
 [comment]: <> (!! Do not edit this file but 'docs/templates' or 'docs/root-templates', See [CONTRIBUTING.md] !!)
 
-[Full Example Here](https://github.com/EntryPointKR/SpigradleSample/tree/master/spigot)
+[Full Example Here](https://github.com/spigradle/spigradle-sample/tree/master/spigot)
 
 Groovy DSL
 
diff --git a/docs/templates/template_bungeecord_plugin.md b/docs/templates/template_bungeecord_plugin.md
@@ -38,7 +38,7 @@ gradlew wrapper --gradle-version $GRADLE_VERSION --distribution-type all
 
 ## Usage
 
-[Full Example Here](https://github.com/EntryPointKR/SpigradleSample/tree/master/bungeecord)
+[Full Example Here](https://github.com/spigradle/spigradle-sample/tree/master/bungeecord)
 
 Groovy DSL
 
diff --git a/docs/templates/template_nukkit_plugin.md b/docs/templates/template_nukkit_plugin.md
@@ -38,7 +38,7 @@ gradlew wrapper --gradle-version $GRADLE_VERSION --distribution-type all
 
 ## Usage
 
-[Full Example Here](https://github.com/EntryPointKR/SpigradleSample/tree/master/nukkit)
+[Full Example Here](https://github.com/spigradle/spigradle-sample/tree/master/nukkit)
 
 Groovy DSL
 
diff --git a/docs/templates/template_spigot_plugin.md b/docs/templates/template_spigot_plugin.md
@@ -44,7 +44,7 @@ gradlew wrapper --gradle-version $GRADLE_VERSION --distribution-type all
 
 ## Usage
 
-[Full Example Here](https://github.com/EntryPointKR/SpigradleSample/tree/master/spigot)
+[Full Example Here](https://github.com/spigradle/spigradle-sample/tree/master/spigot)
 
 Groovy DSL
 
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     }
   },
   "release": {
-    "repositoryUrl": "https://github.com/EntryPointKR/Spigradle",
+    "repositoryUrl": "https://github.com/spigradle/spigradle",
     "branches": [
       "master"
     ],
diff --git a/src/main/java/kr/entree/spigradle/PluginMain.java b/src/main/java/kr/entree/spigradle/PluginMain.java
diff --git a/src/main/kotlin/kr/entree/spigradle/SpigradleAnnotations.kt b/src/main/kotlin/kr/entree/spigradle/SpigradleAnnotations.kt
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-package kr.entree.spigradle
-
-typealias Plugin = PluginMain
+package kr.entree.spigradle
diff --git a/src/main/kotlin/kr/entree/spigradle/data/CommonData.kt b/src/main/kotlin/kr/entree/spigradle/data/CommonData.kt
@@ -24,6 +24,7 @@ import kr.entree.spigradle.SpigradleMeta
 object Dependencies {
     val LOMBOK = Dependency("org.projectlombok", "lombok", "1.18.12")
     val SPIGRADLE = Dependency("kr.entree", "spigradle", SpigradleMeta.VERSION)
+    val SPIGRADLE_ANNOTATIONS = Dependency(SPIGRADLE, name = "spigradle-annotations", version = "1.2.0")
 }
 
 object Repositories {
diff --git a/src/main/kotlin/kr/entree/spigradle/internal/PluginAnnotationProcessor.kt b/src/main/kotlin/kr/entree/spigradle/internal/PluginAnnotationProcessor.kt
diff --git a/src/main/kotlin/kr/entree/spigradle/module/common/SpigradlePlugin.kt b/src/main/kotlin/kr/entree/spigradle/module/common/SpigradlePlugin.kt
@@ -17,10 +17,10 @@
 package kr.entree.spigradle.module.common
 
 import groovy.lang.Closure
+import kr.entree.spigradle.annotations.processor.PluginAnnotationProcessor.PLUGIN_APT_DEFAULT_PATH
+import kr.entree.spigradle.annotations.processor.PluginAnnotationProcessor.PLUGIN_APT_RESULT_PATH_KEY
 import kr.entree.spigradle.data.*
 import kr.entree.spigradle.data.Repositories.SONATYPE
-import kr.entree.spigradle.internal.PLUGIN_APT_DEFAULT_PATH
-import kr.entree.spigradle.internal.PLUGIN_APT_RESULT_PATH_KEY
 import kr.entree.spigradle.internal.groovyExtension
 import kr.entree.spigradle.internal.toFieldEntries
 import org.gradle.api.Plugin
@@ -77,12 +77,12 @@ class SpigradlePlugin : Plugin<Project> {
 
     private fun Project.setupDefaultDependencies() {
         dependencies.apply {
-            val spigradleNotation = Dependencies.SPIGRADLE.format()
-            add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, spigradleNotation)
+            val notation = Dependencies.SPIGRADLE_ANNOTATIONS.format()
+            add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, notation)
             if (project.configurations.findByName("kapt") != null) {
-                add("kapt", spigradleNotation)
+                add("kapt", notation)
             } else {
-                add(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME, spigradleNotation)
+                add(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME, notation)
             }
         }
     }
@@ -130,7 +130,7 @@ class SpigradlePlugin : Plugin<Project> {
     private fun Project.setupAnnotationProcessorOptions() {
         val compileJava: JavaCompile by tasks
         val path = File(buildDir, PLUGIN_APT_DEFAULT_PATH)
-        compileJava.options.compilerArgs.add("-A${PLUGIN_APT_RESULT_PATH_KEY}=${path.absolutePath}")
+        compileJava.options.compilerArgs.add("-A$PLUGIN_APT_RESULT_PATH_KEY=${path.absolutePath}")
     }
 
     private fun Project.markExcludeDirectories() {
diff --git a/src/main/kotlin/kr/entree/spigradle/module/common/SubclassDetection.kt b/src/main/kotlin/kr/entree/spigradle/module/common/SubclassDetection.kt
@@ -16,7 +16,7 @@
 
 package kr.entree.spigradle.module.common
 
-import kr.entree.spigradle.internal.PLUGIN_APT_DEFAULT_PATH
+import kr.entree.spigradle.annotations.processor.PluginAnnotationProcessor.PLUGIN_APT_DEFAULT_PATH
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
diff --git a/src/main/kotlin/kr/entree/spigradle/module/common/YamlGenerate.kt b/src/main/kotlin/kr/entree/spigradle/module/common/YamlGenerate.kt
@@ -36,6 +36,7 @@ import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.*
 import java.io.File
 import java.nio.charset.Charset
+import kr.entree.spigradle.annotations.processor.PluginAnnotationProcessor.PLUGIN_APT_DEFAULT_PATH
 
 /**
  * Generates a YAML into the given files.
diff --git a/src/main/kotlin/kr/entree/spigradle/module/spigot/SpigotExtension.kt b/src/main/kotlin/kr/entree/spigradle/module/spigot/SpigotExtension.kt
@@ -113,7 +113,7 @@ open class SpigotExtension(project: Project) : StandardDescription {
     /**
      * The name of main class that extends [org.bukkit.plugin.java.JavaPlugin].
      *
-     * Defaults to the class that auto-detected by [kr.entree.spigradle.module.common.SubclassDetection] or presented by [kr.entree.spigradle.PluginMain].
+     * Defaults to the class that auto-detected by [kr.entree.spigradle.module.common.SubclassDetection] or presented by [kr.entree.spigradle.Plugin].
      *
      * See: [https://www.spigotmc.org/wiki/plugin-yml/]
      */
diff --git a/src/main/kotlin/kr/entree/spigradle/module/spigot/SpigotPlugin.kt b/src/main/kotlin/kr/entree/spigradle/module/spigot/SpigotPlugin.kt
@@ -40,7 +40,7 @@ import org.gradle.kotlin.dsl.provideDelegate
  */
 class SpigotPlugin : Plugin<Project> {
     companion object {
-        const val DESC_GEN_TASK_NAME = "generateSpigotDescription"
+        const val DESC_GEN_TASK_NAME = "spigotPluginYaml"
         const val MAIN_DETECTION_TASK_NAME = "detectSpigotMain"
         const val EXTENSION_NAME = "spigot"
         const val DESC_FILE_NAME = "plugin.yml"
diff --git a/src/test/kotlin/kr/entree/spigradle/GenerateYamlTaskTest.kt b/src/test/kotlin/kr/entree/spigradle/GenerateYamlTaskTest.kt
@@ -56,7 +56,7 @@ class GenerateYamlTaskTest {
             name = "Spigradle"
             version = "1.1"
             description = "This plugin does so much stuff it can't be contained!"
-            website = "https://github.com/EntryPointKR/Spigradle"
+            website = "https://github.com/spigradle/spigradle"
             authors = listOf("EntryPoint")
             apiVersion = "1.15"
             load = Load.POST_WORLD
diff --git a/src/test/resources/nukkit/groovy/src/main/java/NukkitPlugin.java b/src/test/resources/nukkit/groovy/src/main/java/NukkitPlugin.java
@@ -1,7 +1,7 @@
 import cn.nukkit.plugin.PluginBase;
-import kr.entree.spigradle.PluginMain;
+import kr.entree.spigradle.Plugin;
 
-@PluginMain
+@Plugin
 public class NukkitPlugin extends PluginBase {
 
 }
diff --git a/src/test/resources/spigot/groovy/src/main/java/SpigotPlugin.java b/src/test/resources/spigot/groovy/src/main/java/SpigotPlugin.java
diff --git a/src/test/resources/spigot/plugin.yml b/src/test/resources/spigot/plugin.yml

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ plugins {`
`5`	`5`
`6`	`6`	`repositories {`
`7`	`7`	`jcenter()`
`8`		`- mavenCentral()`
`9`	`8`	`gradlePluginPortal()`
`10`	`9`	`}`
`11`	`10`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ tasks {`
`13`	`13`	`jdkVersion = 8`
`14`	`14`	`sourceLink {`
`15`	`15`	`path = "src/main/kotlin"`
`16`		`- url = "https://github.com/EntryPointKR/Spigradle/tree/master/src/main/kotlin"`
	`16`	`+ url = "https://github.com/spigradle/spigradle/tree/master/src/main/kotlin"`
`17`	`17`	`lineSuffix = "#L"`
`18`	`18`	`}`
`19`	`19`	`externalDocumentationLink {`