Compare commits

..

No commits in common. "0cfd2433366fc0b3986592b283d055b789aad08e" and "eb893d62c99817438d184f0d775a0f5a5de9f5dd" have entirely different histories.

7 changed files with 29 additions and 19 deletions

View file

@ -9,7 +9,7 @@ val rootDependencyDir = "net.frankheijden.serverutils.dependencies"
val dependencyDir = "net.frankheijden.serverutils.bukkit.dependencies" val dependencyDir = "net.frankheijden.serverutils.bukkit.dependencies"
version = rootProject.version version = rootProject.version
base { base {
archivesName.set("${rootProject.name}-Bukkit") archivesName.set("${rootProject.name}-bukkit")
} }
dependencies { dependencies {

View file

@ -9,7 +9,7 @@ val rootDependencyDir = "net.frankheijden.serverutils.dependencies"
val dependencyDir = "net.frankheijden.serverutils.bungee.dependencies" val dependencyDir = "net.frankheijden.serverutils.bungee.dependencies"
version = rootProject.version version = rootProject.version
base { base {
archivesName.set("${rootProject.name}-Bungee") archivesName.set("${rootProject.name}-bungee")
} }
repositories { repositories {

View file

@ -7,7 +7,7 @@ plugins {
group = rootProject.group group = rootProject.group
version = "${rootProject.version}" version = "${rootProject.version}"
base { base {
archivesName.set("${rootProject.name}-Common") archivesName.set("${rootProject.name}-common")
} }
repositories { repositories {

View file

@ -25,7 +25,7 @@ repositories {
} }
dependencies { dependencies {
compileOnly("org.zhdev.bukman:Bukman:VERSION") compileOnly("org.zhdev.bukman:bukman:VERSION")
} }
``` ```
@ -44,7 +44,7 @@ dependencies {
<!-- Bukman dependency --> <!-- Bukman dependency -->
<dependency> <dependency>
<groupId>org.zhdev.bukman</groupId> <groupId>org.zhdev.bukman</groupId>
<artifactId>Bukman</artifactId> <artifactId>bukman</artifactId>
<version>VERSION</version> <version>VERSION</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

View file

@ -8,7 +8,7 @@ group = "${rootProject.group}"
val dependencyDir = "net.frankheijden.serverutils.velocity.dependencies" val dependencyDir = "net.frankheijden.serverutils.velocity.dependencies"
version = rootProject.version version = rootProject.version
base { base {
archivesName.set("${rootProject.name}-Velocity") archivesName.set("${rootProject.name}-velocity")
} }
repositories { repositories {

View file

@ -101,21 +101,26 @@ subprojects {
publishing { publishing {
repositories { repositories {
maven { maven {
name = "zhdev" name = "fvdh"
url = uri("https://maven.zhira.net/repository/zhdev/") url = if (rootProject.version.toString().endsWith("-SNAPSHOT")) {
uri("https://repo.fvdh.dev/snapshots")
} else {
uri("https://repo.fvdh.dev/releases")
}
credentials { credentials {
username = System.getenv("MAVEN_USERNAME") username = System.getenv("FVDH_USERNAME")
password = System.getenv("MAVEN_PASSWORD") password = System.getenv("FVDH_TOKEN")
} }
} }
} }
publications { publications {
create<MavenPublication>("Bukman") { create<MavenPublication>("bukman") {
artifact(tasks["shadowJar"]) { artifact(tasks["shadowJar"]) {
classifier = "" classifier = ""
} }
artifactId = "Bukman-$artifactId" artifactId = "bukman-$artifactId"
} }
} }
} }
@ -175,21 +180,26 @@ tasks.register<Copy>("copyJars") {
publishing { publishing {
repositories { repositories {
maven { maven {
name = "zhdev" name = "fvdh"
url = uri("https://maven.zhira.net/repository/zhdev/") url = if (version.toString().endsWith("-SNAPSHOT")) {
uri("https://repo.fvdh.dev/snapshots")
} else {
uri("https://repo.fvdh.dev/releases")
}
credentials { credentials {
username = System.getenv("MAVEN_USERNAME") username = System.getenv("FVDH_USERNAME")
password = System.getenv("MAVEN_PASSWORD") password = System.getenv("FVDH_TOKEN")
} }
} }
} }
publications { publications {
create<MavenPublication>("Bukman") { create<MavenPublication>("bukman") {
artifact(tasks["shadowJar"]) { artifact(tasks["shadowJar"]) {
classifier = "" classifier = ""
} }
artifactId = "Bukman" artifactId = "bukman"
} }
} }
} }

View file

@ -1,4 +1,4 @@
rootProject.name = "Bukman" rootProject.name = "bukman"
include("Common") include("Common")
include("Bukkit") include("Bukkit")
include("Bungee") include("Bungee")