Skip to content

Commit 3ae389c

Browse files
committed
Add required repos for some dependencies
1 parent a88c040 commit 3ae389c

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

src/main/groovy/ru/endlesscode/bukkitgradle/util/Dependencies.groovy

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ class Dependencies {
4747

4848
depHandler.ext {
4949
spigot = { api('org.spigotmc', 'spigot') }
50-
spigotApi = { api('org.spigotmc', 'spigot-api') }
51-
bukkit = { api('org.bukkit', 'bukkit') }
50+
spigotApi = { api('org.spigotmc', 'spigot-api', 'spigot') }
51+
bukkit = { api('org.bukkit', 'bukkit', 'spigot') }
5252
craftbukkit = { api('org.bukkit', 'craftbukkit') }
53-
paperApi = { api('com.destroystokyo.paper', 'paper-api') }
53+
paperApi = { api('com.destroystokyo.paper', 'paper-api', 'destroystokyo') }
5454
}
5555
}
5656

@@ -61,8 +61,16 @@ class Dependencies {
6161
}
6262
}
6363

64-
private static Dependency api(String groupId, String artifactId) {
65-
def version = project.bukkit.version
64+
private static Dependency api(String groupId, String artifactId, String... requiredRepos) {
65+
String version = project.bukkit.version
66+
return dep(groupId, artifactId, version, requiredRepos)
67+
}
68+
69+
private static Dependency dep(String groupId, String artifactId, String version, String... requiredRepos) {
70+
for (repo in requiredRepos) {
71+
repoHandler.ext."$repo"()
72+
}
73+
6674
return depHandler.create("$groupId:$artifactId:$version")
6775
}
6876
}

src/test/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePluginTest.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class BukkitGradlePluginTest extends TestBase {
1717
@Test
1818
void testPluginAddsRequiredRepos() throws Exception {
1919
project.repositories {
20-
spigot()
20+
sk89q()
2121
}
2222

23-
project.repositories.getByName("spigot-repo")
23+
project.repositories.getByName("sk89q-repo")
2424
}
2525

2626
@Test
@@ -30,6 +30,7 @@ class BukkitGradlePluginTest extends TestBase {
3030
assertEquals('org.bukkit', dependency.group)
3131
assertEquals('bukkit', dependency.name)
3232
assertEquals('+', dependency.version)
33+
project.repositories.getByName("spigot-repo")
3334
}
3435

3536
@Test

0 commit comments

Comments
 (0)