Browse Source

Migrate to Arch Plugin 3

shedaniel 4 years ago
parent
commit
78043a3109
6 changed files with 23 additions and 19 deletions
  1. 2 2
      build.gradle
  2. 3 2
      fabric/build.gradle
  3. 3 2
      forge/build.gradle
  4. 4 4
      gradle.properties
  5. 5 4
      testmod-fabric/build.gradle
  6. 6 5
      testmod-forge/build.gradle

+ 2 - 2
build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "2.0.65"
-    id "forgified-fabric-loom" version "0.6.54" apply false
+    id "architectury-plugin" version "3.0.79"
+    id "forgified-fabric-loom" version "0.6.67" apply false
     id "org.cadixdev.licenser" version "0.5.0"
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "maven-publish"

+ 3 - 2
fabric/build.gradle

@@ -24,6 +24,7 @@ artifacts {
 
 architectury {
     platformSetupLoomIde()
+    fabric()
 }
 
 dependencies {
@@ -35,10 +36,10 @@ dependencies {
     implementation "net.jodah:typetools:0.6.2"
     shadow "net.jodah:typetools:0.6.2"
 
-    compileOnly(project(path: ":common")) {
+    implementation(project(path: ":common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":common", configuration: "transformDevelopmentFabric")) {
+    developmentFabric(project(path: ":common")) {
         transitive = false
     }
     shadow(project(path: ":common", configuration: "transformProductionFabric")) {

+ 3 - 2
forge/build.gradle

@@ -18,6 +18,7 @@ artifacts {
 
 architectury {
     platformSetupLoomIde()
+    forge()
 }
 
 dependencies {
@@ -27,10 +28,10 @@ dependencies {
     implementation "net.jodah:typetools:0.6.2"
     shadow "net.jodah:typetools:0.6.2"
 
-    compileOnly(project(path: ":common")) {
+    implementation(project(path: ":common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":common", configuration: "transformDevelopmentForge")) {
+    developmentForge(project(path: ":common")) {
         transitive = false
     }
     shadow(project(path: ":common", configuration: "transformProductionForge")) {

+ 4 - 4
gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.16.4
+minecraft_version=1.16.5
 supported_version=1.16.4/5
 
 archives_base_name=architectury
@@ -9,8 +9,8 @@ archives_base_name_snapshot=architectury-snapshot
 base_version=1.7
 maven_group=me.shedaniel
 
-fabric_loader_version=0.10.8
-fabric_api_version=0.29.3+1.16
+fabric_loader_version=0.11.1
+fabric_api_version=0.30.3+1.16
 mod_menu_version=1.14.6+
 
-forge_version=35.1.36
+forge_version=36.0.42

+ 5 - 4
testmod-fabric/build.gradle

@@ -5,6 +5,7 @@ plugins {
 
 architectury {
     platformSetupLoomIde()
+    fabric()
 }
 
 dependencies {
@@ -15,16 +16,16 @@ dependencies {
     modCompileOnly "io.github.prospector:modmenu:${rootProject.mod_menu_version}"
 
     implementation project(path: ":fabric", configuration: "dev")
-    compileOnly(project(path: ":common")) {
+    implementation(project(path: ":common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":common", configuration: "transformDevelopmentFabric")) {
+    developmentFabric(project(path: ":common")) {
         transitive = false
     }
-    compileOnly(project(path: ":testmod-common")) {
+    implementation(project(path: ":testmod-common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":testmod-common", configuration: "transformDevelopmentFabric")) {
+    developmentFabric(project(path: ":testmod-common")) {
         transitive = false
     }
 }

+ 6 - 5
testmod-forge/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 loom {
-    mixinConfig = "architectury.mixins.json"
+    mixinConfig "architectury.mixins.json"
     
     localMods {
         it.add(project(":forge").sourceSets.main)
@@ -13,6 +13,7 @@ loom {
 
 architectury {
     platformSetupLoomIde()
+    forge()
 }
 
 dependencies {
@@ -21,16 +22,16 @@ dependencies {
     forge "net.minecraftforge:forge:${gradle.rootProject.architectury.minecraft}-${rootProject.forge_version}"
 
     implementation project(path: ":forge", configuration: "dev")
-    compileOnly(project(path: ":common")) {
+    implementation(project(path: ":common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":common", configuration: "transformDevelopmentForge")) {
+    developmentForge(project(path: ":common")) {
         transitive = false
     }
-    compileOnly(project(path: ":testmod-common")) {
+    implementation(project(path: ":testmod-common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":testmod-common", configuration: "transformDevelopmentForge")) {
+    developmentForge(project(path: ":testmod-common")) {
         transitive = false
     }
 }