Skip to content

Commit cd897fe

Browse files
Unify repository definition (#4953)
* Unify repository definition * Remove duplicate repo * Update build-logic/src/main/kotlin/geyser.build-logic.gradle.kts Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com> --------- Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
1 parent ee0b34e commit cd897fe

File tree

3 files changed

+46
-55
lines changed

3 files changed

+46
-55
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
repositories {
2+
// mavenLocal()
3+
4+
mavenCentral()
5+
6+
// Floodgate, Cumulus etc.
7+
maven("https://repo.opencollab.dev/main")
8+
9+
// Paper, Velocity
10+
maven("https://repo.papermc.io/repository/maven-public")
11+
12+
// Spigot
13+
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
14+
mavenContent { snapshotsOnly() }
15+
}
16+
17+
// BungeeCord
18+
maven("https://oss.sonatype.org/content/repositories/snapshots") {
19+
mavenContent { snapshotsOnly() }
20+
}
21+
22+
// NeoForge
23+
maven("https://maven.neoforged.net/releases") {
24+
mavenContent { releasesOnly() }
25+
}
26+
27+
// Minecraft
28+
maven("https://libraries.minecraft.net") {
29+
name = "minecraft"
30+
mavenContent { releasesOnly() }
31+
}
32+
33+
// ViaVersion
34+
maven("https://repo.viaversion.com") {
35+
name = "viaversion"
36+
}
37+
38+
// Jitpack for e.g. MCPL
39+
maven("https://jitpack.io") {
40+
content { includeGroupByRegex("com\\.github\\..*") }
41+
}
42+
43+
// For Adventure snapshots
44+
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
45+
}

build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.gradle.kotlin.dsl.dependencies
55
import org.gradle.kotlin.dsl.maven
66

77
plugins {
8+
id("geyser.build-logic")
89
id("geyser.publish-conventions")
910
id("architectury-plugin")
1011
id("dev.architectury.loom")
@@ -116,12 +117,3 @@ dependencies {
116117
minecraft(libs.minecraft)
117118
mappings(loom.officialMojangMappings())
118119
}
119-
120-
repositories {
121-
// mavenLocal()
122-
maven("https://repo.opencollab.dev/main")
123-
maven("https://jitpack.io")
124-
maven("https://oss.sonatype.org/content/repositories/snapshots/")
125-
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
126-
maven("https://maven.neoforged.net/releases")
127-
}

settings.gradle.kts

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,6 @@
22

33
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
44

5-
dependencyResolutionManagement {
6-
repositories {
7-
// mavenLocal()
8-
9-
// Floodgate, Cumulus etc.
10-
maven("https://repo.opencollab.dev/main")
11-
12-
// Paper, Velocity
13-
maven("https://repo.papermc.io/repository/maven-public")
14-
// Spigot
15-
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
16-
mavenContent { snapshotsOnly() }
17-
}
18-
19-
// BungeeCord
20-
maven("https://oss.sonatype.org/content/repositories/snapshots") {
21-
mavenContent { snapshotsOnly() }
22-
}
23-
24-
// NeoForge
25-
maven("https://maven.neoforged.net/releases") {
26-
mavenContent { releasesOnly() }
27-
}
28-
29-
// Minecraft
30-
maven("https://libraries.minecraft.net") {
31-
name = "minecraft"
32-
mavenContent { releasesOnly() }
33-
}
34-
35-
mavenCentral()
36-
37-
// ViaVersion
38-
maven("https://repo.viaversion.com") {
39-
name = "viaversion"
40-
}
41-
42-
maven("https://jitpack.io") {
43-
content { includeGroupByRegex("com\\.github\\..*") }
44-
}
45-
46-
// For Adventure snapshots
47-
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
48-
}
49-
}
50-
515
pluginManagement {
526
repositories {
537
gradlePluginPortal()

0 commit comments

Comments
 (0)