aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle6
-rw-r--r--spark-bukkit/build.gradle4
-rw-r--r--spark-bungeecord/build.gradle4
-rw-r--r--spark-common/build.gradle26
-rw-r--r--spark-fabric/build.gradle20
-rw-r--r--spark-forge/build.gradle8
-rw-r--r--spark-forge1122/build.gradle10
-rw-r--r--spark-nukkit/build.gradle6
-rw-r--r--spark-sponge/build.gradle4
-rw-r--r--spark-sponge8/build.gradle4
-rw-r--r--spark-universal/build.gradle10
-rw-r--r--spark-velocity/build.gradle6
-rw-r--r--spark-velocity2/build.gradle6
13 files changed, 62 insertions, 52 deletions
diff --git a/build.gradle b/build.gradle
index 1812f28..e45d802 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@ allprojects {
subprojects {
apply plugin: 'java'
- apply plugin: 'maven'
apply plugin: 'idea'
+ apply plugin: 'java-library'
ext {
pluginVersion = '1.6.0'
@@ -25,6 +25,10 @@ subprojects {
options.encoding = 'UTF-8'
}
+ processResources {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ }
+
repositories {
mavenCentral()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle
index 8126bad..df70d84 100644
--- a/spark-bukkit/build.gradle
+++ b/spark-bukkit/build.gradle
@@ -1,6 +1,6 @@
dependencies {
- compile project(':spark-common')
- compile('me.lucko:adventure-platform-bukkit:4.7.0') {
+ implementation project(':spark-common')
+ implementation('me.lucko:adventure-platform-bukkit:4.7.0') {
exclude(module: 'adventure-api')
exclude(module: 'checker-qual')
exclude(module: 'annotations')
diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle
index e7487d8..e9c814e 100644
--- a/spark-bungeecord/build.gradle
+++ b/spark-bungeecord/build.gradle
@@ -1,6 +1,6 @@
dependencies {
- compile project(':spark-common')
- compile('me.lucko:adventure-platform-bungeecord:4.7.0') {
+ implementation project(':spark-common')
+ implementation('me.lucko:adventure-platform-bungeecord:4.7.0') {
exclude(module: 'adventure-api')
exclude(module: 'checker-qual')
exclude(module: 'annotations')
diff --git a/spark-common/build.gradle b/spark-common/build.gradle
index 59e6439..f6b54f3 100644
--- a/spark-common/build.gradle
+++ b/spark-common/build.gradle
@@ -1,28 +1,28 @@
plugins {
- id 'com.google.protobuf' version '0.8.14'
+ id 'com.google.protobuf' version '0.8.16'
}
dependencies {
- compile project(':spark-api')
- compile 'com.github.jvm-profiling-tools:async-profiler:v2.0'
- compile 'org.ow2.asm:asm:7.1'
- compile 'com.google.protobuf:protobuf-javalite:3.15.6'
- compile 'com.squareup.okhttp3:okhttp:3.14.1'
- compile 'com.squareup.okio:okio:1.17.3'
- compile 'net.bytebuddy:byte-buddy-agent:1.11.0'
- compile 'org.tukaani:xz:1.8'
- compile('net.kyori:adventure-api:4.7.0') {
+ api project(':spark-api')
+ implementation 'com.github.jvm-profiling-tools:async-profiler:v2.0'
+ implementation 'org.ow2.asm:asm:7.1'
+ implementation 'com.google.protobuf:protobuf-javalite:3.15.6'
+ implementation 'com.squareup.okhttp3:okhttp:3.14.1'
+ implementation 'com.squareup.okio:okio:1.17.3'
+ implementation 'net.bytebuddy:byte-buddy-agent:1.11.0'
+ implementation 'org.tukaani:xz:1.8'
+ api('net.kyori:adventure-api:4.7.0') {
exclude(module: 'checker-qual')
exclude(module: 'annotations')
}
- compile('net.kyori:adventure-text-serializer-gson:4.7.0') {
+ api('net.kyori:adventure-text-serializer-gson:4.7.0') {
exclude(module: 'adventure-api')
exclude(module: 'gson')
}
- compile('net.kyori:adventure-text-serializer-legacy:4.7.0') {
+ api('net.kyori:adventure-text-serializer-legacy:4.7.0') {
exclude(module: 'adventure-api')
}
- compile('net.kyori:adventure-text-feature-pagination:4.0.0-SNAPSHOT') {
+ implementation('net.kyori:adventure-text-feature-pagination:4.0.0-SNAPSHOT') {
exclude(module: 'adventure-api')
}
compileOnly 'com.google.code.gson:gson:2.7'
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 9fda9a8..9523978 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -1,8 +1,14 @@
import net.fabricmc.loom.task.RemapJarTask
plugins {
- id 'fabric-loom' version '0.5-SNAPSHOT'
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'fabric-loom' version '0.8-SNAPSHOT'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
+}
+
+compileJava {
+ // override, compile targeting J11
+ options.compilerArgs.clear()
+ options.compilerArgs.addAll(['--release', '11'])
}
repositories {
@@ -12,14 +18,14 @@ repositories {
configurations {
shade
- compile.extendsFrom shade
+ implementation.extendsFrom shade
}
dependencies {
// https://modmuss50.me/fabric.html
- minecraft 'com.mojang:minecraft:1.16.4'
- mappings 'net.fabricmc:yarn:1.16.4+build.6:v2'
- modImplementation 'net.fabricmc:fabric-loader:0.10.6+build.214'
+ minecraft 'com.mojang:minecraft:1.17'
+ mappings 'net.fabricmc:yarn:1.17+build.10:v2'
+ modImplementation 'net.fabricmc:fabric-loader:0.11.3'
Set<String> apiModules = [
"fabric-api-base",
@@ -29,7 +35,7 @@ dependencies {
// Add each module as a dependency
apiModules.forEach {
- modImplementation(fabricApi.module(it, '0.25.1+build.416-1.16'))
+ modImplementation(fabricApi.module(it, '0.35.1+1.17'))
}
include(modImplementation('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
index f74f135..c9df687 100644
--- a/spark-forge/build.gradle
+++ b/spark-forge/build.gradle
@@ -1,15 +1,15 @@
buildscript {
repositories {
- maven { url = "http://files.minecraftforge.net/maven" }
+ maven { url = "https://files.minecraftforge.net/maven" }
mavenCentral()
}
dependencies {
- classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+ classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
plugins {
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
apply plugin: 'net.minecraftforge.gradle'
@@ -21,7 +21,7 @@ minecraft {
configurations {
shade
- compile.extendsFrom shade
+ implementation.extendsFrom shade
}
dependencies {
diff --git a/spark-forge1122/build.gradle b/spark-forge1122/build.gradle
index 12c2d57..fa3473b 100644
--- a/spark-forge1122/build.gradle
+++ b/spark-forge1122/build.gradle
@@ -1,15 +1,15 @@
buildscript {
repositories {
- maven { url = "http://files.minecraftforge.net/maven" }
+ maven { url = "https://files.minecraftforge.net/maven" }
}
dependencies {
- classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+ classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
plugins {
- id 'net.kyori.blossom' version '1.1.0'
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'net.kyori.blossom' version '1.3.0'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
apply plugin: 'net.minecraftforge.gradle'
@@ -20,7 +20,7 @@ minecraft {
configurations {
shade
- compile.extendsFrom shade
+ implementation.extendsFrom shade
}
// https://github.com/MinecraftForge/ForgeGradle/issues/627#issuecomment-533927535
diff --git a/spark-nukkit/build.gradle b/spark-nukkit/build.gradle
index 0f2f04d..86554a0 100644
--- a/spark-nukkit/build.gradle
+++ b/spark-nukkit/build.gradle
@@ -1,10 +1,10 @@
plugins {
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
dependencies {
- compile project(':spark-common')
- compile('net.kyori:adventure-text-serializer-legacy:4.4.0')
+ implementation project(':spark-common')
+ implementation('net.kyori:adventure-text-serializer-legacy:4.4.0')
compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT'
}
diff --git a/spark-sponge/build.gradle b/spark-sponge/build.gradle
index 3d827b7..b81008c 100644
--- a/spark-sponge/build.gradle
+++ b/spark-sponge/build.gradle
@@ -1,9 +1,9 @@
plugins {
- id 'net.kyori.blossom' version '1.1.0'
+ id 'net.kyori.blossom' version '1.3.0'
}
dependencies {
- compile project(':spark-common')
+ implementation project(':spark-common')
compileOnly 'org.spongepowered:spongeapi:7.3.0'
annotationProcessor 'org.spongepowered:spongeapi:7.3.0'
}
diff --git a/spark-sponge8/build.gradle b/spark-sponge8/build.gradle
index a938bb2..4f23011 100644
--- a/spark-sponge8/build.gradle
+++ b/spark-sponge8/build.gradle
@@ -1,9 +1,9 @@
plugins {
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
dependencies {
- compile project(':spark-common')
+ implementation project(':spark-common')
compileOnly "org.spongepowered:spongeapi:8.0.0-SNAPSHOT"
}
diff --git a/spark-universal/build.gradle b/spark-universal/build.gradle
index 665dc65..26dbd30 100644
--- a/spark-universal/build.gradle
+++ b/spark-universal/build.gradle
@@ -1,12 +1,12 @@
plugins {
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
dependencies {
- compile project(':spark-common')
- compile project(':spark-bukkit')
- compile project(':spark-bungeecord')
- compile project(':spark-sponge')
+ implementation project(':spark-common')
+ implementation project(':spark-bukkit')
+ implementation project(':spark-bungeecord')
+ implementation project(':spark-sponge')
}
shadowJar {
diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle
index 8cce858..c27677d 100644
--- a/spark-velocity/build.gradle
+++ b/spark-velocity/build.gradle
@@ -1,10 +1,10 @@
plugins {
- id 'net.kyori.blossom' version '1.1.0'
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'net.kyori.blossom' version '1.3.0'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
dependencies {
- compile project(':spark-common')
+ implementation project(':spark-common')
compileOnly 'com.velocitypowered:velocity-api:1.1.5'
annotationProcessor 'com.velocitypowered:velocity-api:1.1.5'
}
diff --git a/spark-velocity2/build.gradle b/spark-velocity2/build.gradle
index ec971e5..f16ab40 100644
--- a/spark-velocity2/build.gradle
+++ b/spark-velocity2/build.gradle
@@ -1,6 +1,6 @@
plugins {
- id 'net.kyori.blossom' version '1.1.0'
- id 'com.github.johnrengelman.shadow' version '4.0.1'
+ id 'net.kyori.blossom' version '1.3.0'
+ id 'com.github.johnrengelman.shadow' version '7.0.0'
}
compileJava {
@@ -10,7 +10,7 @@ compileJava {
}
dependencies {
- compile project(':spark-common')
+ implementation project(':spark-common')
compileOnly 'com.velocitypowered:velocity-api:2.0.0-SNAPSHOT'
annotationProcessor 'com.velocitypowered:velocity-annotation-processor:2.0.0-SNAPSHOT'
}
generated by cgit (git 2.46.0) at 2024-11-22 06:42:24 +0000