Fix 1.20/1.20.1 spigot-mapped tests

willkroboth · willkroboth · commit 0023e622ba7f · 2025-04-13T17:08:51.000-04:00
I really hope there is an easy way to include different transitive dependencies based on the classifier
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.20/pom.xml b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.20/pom.xml
@@ -76,16 +76,14 @@
 			<artifactId>commandapi-bukkit-1.20</artifactId>
 			<version>${project.version}</version>
 			<classifier>mojang-mapped</classifier>
+			<scope>provided</scope>
 		</dependency>
-		<!-- TODO: We also need to be able to access the NMS-common classes, which we do here just adding the dependency again
-		      Is it possible to have nms-common as a transitive dependency, so it is automatically available when using -1.20?
-		      In general whenever we reference an nms module we tend to need to include its dependencies as well, which is
-		      annoyingly verbose and prone to cause errors when forgotten. -->
 		<dependency>
 			<groupId>dev.jorel</groupId>
 			<artifactId>commandapi-bukkit-nms-common</artifactId>
 			<version>${project.version}</version>
 			<classifier>mojang-mapped</classifier>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Version-specific Minecraft dependencies -->
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/pom.xml b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/pom.xml
@@ -400,12 +400,27 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<dependencies>
+				<!-- CommandAPI -->
 				<dependency>
 					<groupId>dev.jorel</groupId>
 					<artifactId>commandapi-bukkit-test-impl-1.20</artifactId>
 					<version>${project.version}</version>
 					<scope>test</scope>
 				</dependency>
+				<dependency>
+					<groupId>dev.jorel</groupId>
+					<artifactId>commandapi-bukkit-1.20</artifactId>
+					<version>${project.version}</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>dev.jorel</groupId>
+					<artifactId>commandapi-bukkit-nms-common</artifactId>
+					<version>${project.version}</version>
+					<scope>provided</scope>
+				</dependency>
+
+				<!-- Server -->
 				<dependency>
 					<groupId>org.spigotmc</groupId>
 					<artifactId>spigot</artifactId>
@@ -429,16 +444,32 @@
 		<profile>
 			<id>Minecraft_1_20_Mojang</id>
 			<dependencies>
+				<!-- CommandAPI -->
 				<dependency>
 					<groupId>dev.jorel</groupId>
 					<artifactId>commandapi-bukkit-test-impl-1.20</artifactId>
 					<version>${project.version}</version>
 					<classifier>mojang-mapped</classifier>
 					<scope>test</scope>
 				</dependency>
-
-				<!-- TODO: Is it possible to make this a transitive dependency of impl-1.20?
+				<!-- TODO: Is it possible to make these transitive dependencies of impl-1.20?
 				      Note that you'd need to make sure the classifier is correct -->
+				<dependency>
+					<groupId>dev.jorel</groupId>
+					<artifactId>commandapi-bukkit-1.20</artifactId>
+					<version>${project.version}</version>
+					<classifier>mojang-mapped</classifier>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>dev.jorel</groupId>
+					<artifactId>commandapi-bukkit-nms-common</artifactId>
+					<version>${project.version}</version>
+					<classifier>mojang-mapped</classifier>
+					<scope>provided</scope>
+				</dependency>
+
+				<!-- Server -->
 				<dependency>
 					<groupId>org.spigotmc</groupId>
 					<artifactId>spigot</artifactId>
