From 857ac274fff200157467961d99fa2f741fe53341 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Wed, 20 Jan 2021 18:25:40 -0500
Subject: [PATCH] client: rename jogl/gluegen osx natives artifacts

gradle does not look at classifiers when doing dependency conflict
resolution, causing it to not correctly handle having multiple
dependencies of differing versions and classifiers. It picks the highest
version of any of the dependencies with the same groupId and artifactId
and uses that for every other dependency regardless of classifier.

This renames the osx natives artifacts to have a unique artifact name to
workaround this issue
---
 runelite-client/pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index c29447cebb..682c6625f8 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -141,9 +141,8 @@
 		</dependency>
 		<dependency>
 			<groupId>net.runelite.jogl</groupId>
-			<artifactId>jogl-all</artifactId>
+			<artifactId>jogl-all-natives-macosx</artifactId>
 			<version>2.4.0-rc-20210117</version>
-			<classifier>natives-macosx-universal</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -174,9 +173,8 @@
 		</dependency>
 		<dependency>
 			<groupId>net.runelite.gluegen</groupId>
-			<artifactId>gluegen-rt</artifactId>
+			<artifactId>gluegen-rt-natives-macosx</artifactId>
 			<version>2.4.0-rc-20210117</version>
-			<classifier>natives-macosx-universal</classifier>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>