diff --git a/build.gradle.kts b/build.gradle.kts index 26d1c15..89c7565 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } group = "io.pyke.vitri" -version = "1.0.0" +version = "1.0.1-SNAPSHOT" description = "A Minecraft mod for simulating autonomous agents." repositories { @@ -19,9 +19,13 @@ repositories { } val includeImplementation by configurations.registering +val includeRuntimeOnly by configurations.registering + configurations { implementation.get().extendsFrom(includeImplementation.get()) - include.get().extendsFrom(includeImplementation.get()) + runtimeOnly.get().extendsFrom(includeRuntimeOnly.get()) + + include.get().extendsFrom(includeImplementation.get(), includeRuntimeOnly.get()) } dependencies { @@ -43,6 +47,9 @@ dependencies { modImplementation(libs.fabric.api) modImplementation(libs.modmenu) + // gRPC's Netty and Guava are not included, since Minecraft has them out of the box + // they are older than the dependency expects, but ABI should be ok for what we need + compileOnly(libs.tomcat.annotations) includeImplementation(libs.grpc.api) includeImplementation(libs.grpc.core) @@ -51,8 +58,9 @@ dependencies { includeImplementation(libs.grpc.services) includeImplementation(libs.grpc.protobuf) includeImplementation(libs.grpc.protobuf.lite) - includeImplementation(libs.grpc.netty.shaded) + includeImplementation(libs.grpc.netty) includeImplementation(libs.protobuf.java) + includeRuntimeOnly(libs.perfmark.api) } loom { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6c0dc6..1d15de1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,9 +16,10 @@ grpc-stub = { group = "io.grpc", name = "grpc-stub", version.ref = "grpc" } grpc-services = { group = "io.grpc", name = "grpc-services", version.ref = "grpc" } grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version.ref = "grpc" } grpc-protobuf-lite = { group = "io.grpc", name = "grpc-protobuf-lite", version.ref = "grpc" } -grpc-netty-shaded = { group = "io.grpc", name = "grpc-netty-shaded", version.ref = "grpc" } +grpc-netty = { group = "io.grpc", name = "grpc-netty", version.ref = "grpc" } tomcat-annotations = { group = "org.apache.tomcat", name = "annotations-api", version = "6.0.53" } protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" } +perfmark-api = { group = "io.perfmark", name = "perfmark-api", version = "0.27.0" } # other mods modmenu = { group = "com.terraformersmc", name = "modmenu", version = "1.16.23" }