Skip to content

Commit

Permalink
Some final cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianMichael committed Jul 21, 2024
1 parent 398f339 commit cf40e6b
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 27 deletions.
20 changes: 4 additions & 16 deletions build-logic/src/main/groovy/vaf.base-conventions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -75,7 +61,9 @@ publishing {
id = "RK_01"
}
developer {
id = "FlorianMichael/EnZaXD"
id = "FlorianMichael"
name = "EnZaXD"
email = "florian.michael07@gmail.com"
}
}
scm {
Expand Down
11 changes: 11 additions & 0 deletions bukkit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
Expand Down
11 changes: 1 addition & 10 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
7 changes: 7 additions & 0 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions velocity/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down

0 comments on commit cf40e6b

Please sign in to comment.