diff options
| author | embeddedt <42941056+embeddedt@users.noreply.github.com> | 2022-12-26 18:58:46 -0500 |
|---|---|---|
| committer | embeddedt <42941056+embeddedt@users.noreply.github.com> | 2022-12-26 18:58:46 -0500 |
| commit | 1075665def4a41cf0064255a6da1d1a652f5d473 (patch) | |
| tree | 11bba64e8f28ce8b83adc05252b75f17e2ccbf6a /spark-common/build.gradle | |
| parent | d9550259c1995d21fc345c58f2e531fdecf75acd (diff) | |
| parent | d9655c40c02aef137c7a6a00a1cc90a1e6fb08d1 (diff) | |
| download | spark-1075665def4a41cf0064255a6da1d1a652f5d473.tar.gz spark-1075665def4a41cf0064255a6da1d1a652f5d473.tar.bz2 spark-1075665def4a41cf0064255a6da1d1a652f5d473.zip | |
Merge remote-tracking branch 'lucko/master' into forge-1.7.10
Diffstat (limited to 'spark-common/build.gradle')
| -rw-r--r-- | spark-common/build.gradle | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/spark-common/build.gradle b/spark-common/build.gradle index 4a20142..c3d960d 100644 --- a/spark-common/build.gradle +++ b/spark-common/build.gradle @@ -1,28 +1,36 @@ +import org.cadixdev.gradle.licenser.LicenseExtension + plugins { - id 'com.google.protobuf' version '0.8.16' + id 'com.google.protobuf' version '0.9.1' } license { exclude '**/sampler/async/jfr/**' } +extensions.configure(LicenseExtension.class) { + it.exclude { + it.file.toString().startsWith(buildDir.toString()) + } +} + dependencies { api project(':spark-api') implementation 'com.github.jvm-profiling-tools:async-profiler:v2.8.3' implementation 'org.ow2.asm:asm:9.1' - implementation 'com.google.protobuf:protobuf-javalite:3.15.6' + implementation 'com.google.protobuf:protobuf-javalite:3.21.11' implementation 'net.bytebuddy:byte-buddy-agent:1.11.0' - api('net.kyori:adventure-api:4.11.0') { + api('net.kyori:adventure-api:4.12.0') { exclude(module: 'adventure-bom') exclude(module: 'checker-qual') exclude(module: 'annotations') } - api('net.kyori:adventure-text-serializer-gson:4.11.0') { + api('net.kyori:adventure-text-serializer-gson:4.12.0') { exclude(module: 'adventure-bom') exclude(module: 'adventure-api') exclude(module: 'gson') } - api('net.kyori:adventure-text-serializer-legacy:4.11.0') { + api('net.kyori:adventure-text-serializer-legacy:4.12.0') { exclude(module: 'adventure-bom') exclude(module: 'adventure-api') } @@ -36,11 +44,7 @@ dependencies { protobuf { protoc { - if (System.getProperty("os.name") == "Mac OS X" && System.getProperty("os.arch") == "aarch64") { - path = '/opt/homebrew/bin/protoc' - } else { - artifact = 'com.google.protobuf:protoc:3.15.6' - } + artifact = 'com.google.protobuf:protoc:3.21.11' } generateProtoTasks { all().each { task -> |