From 2656e522219a0a2b8ff742cfb29ae9ef9a7e8cc6 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 17 Feb 2021 14:51:31 +0800
Subject: [PATCH] Publish the platform specific jars on a different artifact id
 to resolve issues with transitive dependencies.

---
 fabric/build.gradle | 3 ++-
 forge/build.gradle  | 3 ++-
 gradle.properties   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index 8c1f49a6..d9bf440a 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -68,9 +68,10 @@ remapJar {
 publishing {
     publications {
         mavenFabric(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-fabric"
             artifact(remapJar.archivePath) {
                 builtBy build
-                classifier "fabric"
+                classifier null
             }
         }
     }
diff --git a/forge/build.gradle b/forge/build.gradle
index af9fcdd8..4f2dbe69 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -63,9 +63,10 @@ remapJar {
 publishing {
     publications {
         mavenForge(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-fabric"
             artifact(remapJar.archivePath) {
                 builtBy build
-                classifier "forge"
+                classifier null
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
index ef0b40af..401abfbd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ supported_version=1.16.4/5
 
 archives_base_name=architectury
 archives_base_name_snapshot=architectury-snapshot
-base_version=1.6
+base_version=1.7
 maven_group=me.shedaniel
 
 fabric_loader_version=0.10.8