diff --git a/build-logic/src/main/groovy/vaf.base-conventions.gradle b/build-logic/src/main/groovy/vaf.base-conventions.gradle index 1fddc38..56bddc7 100644 --- a/build-logic/src/main/groovy/vaf.base-conventions.gradle +++ b/build-logic/src/main/groovy/vaf.base-conventions.gradle @@ -10,29 +10,15 @@ repositories { name = "ViaVersion" url "https://repo.viaversion.com" } - maven { - name = "SpigotMC" - url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" - } - maven { - name = "SpongePowered" - url "https://repo.spongepowered.org/repository/maven-public/" - } - maven { - name = "VelocityPowered" - url "https://nexus.velocitypowered.com/repository/maven-public/" - } } base { java.toolchain.languageVersion = JavaLanguageVersion.of(17) compileJava.options.encoding = compileTestJava.options.encoding = javadoc.options.encoding = "UTF-8" - archivesName = project.name group = rootProject.maven_group version = rootProject.maven_version - - description = "ViaVersion addon to add support for some notable Minecraft snapshots" + description = rootProject.maven_description } dependencies { @@ -75,7 +61,9 @@ publishing { id = "RK_01" } developer { - id = "FlorianMichael/EnZaXD" + id = "FlorianMichael" + name = "EnZaXD" + email = "florian.michael07@gmail.com" } } scm { diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 84afc0f..088e2b5 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -2,6 +2,17 @@ plugins { id "vaf.platform-conventions" } +repositories { + maven { + name = "SpigotMC" + url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" + } + maven { + name = "SpongePowered" + url "https://repo.spongepowered.org/repository/maven-public/" + } +} + dependencies { compileOnly(annotationProcessor("org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT")) } diff --git a/common/build.gradle b/common/build.gradle index d20d333..a80ce5a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -14,16 +14,7 @@ sourceSets { main { classTokenReplacer { property("\${version}", project.version) - property("\${impl_version}", "git-${rootProject.name}-${project.version}:${project.latestCommitHash()}") + property("\${impl_version}", "git-${rootProject.name}-${project.version}:${rootProject.latestCommitHash()}") } } } - -String latestCommitHash() { - def stdout = new ByteArrayOutputStream() - exec { - commandLine "git", "rev-parse", "--short", "HEAD" - standardOutput = stdout - } - return stdout.toString().trim() -} diff --git a/fabric/build.gradle b/fabric/build.gradle index 6462f7f..4c8351c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,6 +2,13 @@ plugins { id "vaf.platform-conventions" } +repositories { + maven { + name = "FabricMC" + url "https://maven.fabricmc.net/" + } +} + dependencies { compileOnly(annotationProcessor("net.fabricmc:fabric-loader:0.11.3")) compileOnly(annotationProcessor("org.apache.logging.log4j:log4j-api:2.17.1")) diff --git a/gradle.properties b/gradle.properties index ee2a033..a736811 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.parallel=true org.gradle.configureondemand=true maven_group=net.raphimc -maven_name=ViaAprilFools maven_version=3.0.1-SNAPSHOT +maven_description=ViaVersion addon to add support for some notable Minecraft snapshots # Smile emoji mcVersions=1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8 diff --git a/velocity/build.gradle b/velocity/build.gradle index 276dc48..80088e6 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -2,6 +2,13 @@ plugins { id "vaf.platform-conventions" } +repositories { + maven { + name = "VelocityPowered" + url "https://nexus.velocitypowered.com/repository/maven-public/" + } +} + dependencies { compileOnly("com.viaversion:viaversion-velocity:5.0.0") // Needed for logger wrapper compileOnly(annotationProcessor("com.velocitypowered:velocity-api:3.1.1"))