Migrate to using the architect plugin

Signed-off-by: shedaniel <daniel@shedaniel.me>
momo-i2 · Oct 3, 2020 · 4b14569 · 4b14569
1 parent 33614d7
commit 4b14569
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 257 deletions.
diff --git a/architectPlugin/build.gradle b/architectPlugin/build.gradle
diff --git a/architectPlugin/settings.gradle b/architectPlugin/settings.gradle
diff --git a/architectPlugin/src/main/kotlin/me/shedaniel/plugin/architect/ArchitectPlugin.kt b/architectPlugin/src/main/kotlin/me/shedaniel/plugin/architect/ArchitectPlugin.kt
diff --git a/architectPlugin/src/main/kotlin/me/shedaniel/plugin/architect/ArchitectPluginExtension.kt b/architectPlugin/src/main/kotlin/me/shedaniel/plugin/architect/ArchitectPluginExtension.kt
diff --git a/architectPlugin/src/main/kotlin/me/shedaniel/plugin/architect/RemapMCPTask.kt b/architectPlugin/src/main/kotlin/me/shedaniel/plugin/architect/RemapMCPTask.kt
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
 plugins {
-    id "me.shedaniel.plugin.architect"
+    id "architect-plugin" version "1.0.6"
     id "org.jetbrains.gradle.plugin.idea-ext" version "0.7"
 }
 
@@ -30,7 +30,7 @@ architect {
 
 allprojects {
     apply plugin: "java"
-    apply plugin: "me.shedaniel.plugin.architect"
+    apply plugin: "architect-plugin"
 
     group "me.shedaniel"
     archivesBaseName = rootProject.name

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     minecraft("net.minecraftforge:forge:${rootProject.architect.minecraft}-${project.forge_version}")
     implementation(fg.deobf("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_forge}"))
 
-    compile(project(path: ":common", configuration: "mcp")) {
+    compile(project(path: ":common", configuration: "mcpGenerateMod")) {
         transitive = false
     }
     shadow(project(path: ":common", configuration: "mcp")) {

diff --git a/settings.gradle b/settings.gradle
@@ -5,13 +5,12 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven { url "https://dl.bintray.com/shedaniel/cloth" }
         gradlePluginPortal()
     }
 }
 
-includeBuild("architectPlugin")
-
-rootProject.name="light-overlay"
+rootProject.name = "light-overlay"
 
 include("common")
 include("fabric")