minecraft/LuckPerms
1
0
Fork 0
mirror of https://github.com/lucko/LuckPerms.git synced 2025-09-01 02:21:43 +02:00
Code Issues Releases Wiki Activity

Upgrade dependencies and require Java 11

Browse Source
This commit is contained in:
Luck
2025-06-01 16:41:39 +01:00
parent 0486bc885b
commit 9538cb9dad
13 changed files with 96 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/build.gradle
View File

@@ -1,6 +1,9 @@
group = 'net.luckperms' group = 'net.luckperms'
project.version = '5.5' project.version = '5.5'
sourceCompatibility = 1.8
targetCompatibility = 1.8
jar { jar {
manifest { manifest {
attributes('Automatic-Module-Name': 'net.luckperms.api') attributes('Automatic-Module-Name': 'net.luckperms.api')

4
build.gradle
View File

@@ -15,8 +15,8 @@ subprojects {
group = 'me.lucko.luckperms' group = 'me.lucko.luckperms'
version = '5.5-SNAPSHOT' version = '5.5-SNAPSHOT'
sourceCompatibility = 1.8 sourceCompatibility = 11
targetCompatibility = 1.8 targetCompatibility = 11
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'

54
common/build.gradle
View File

@@ -17,18 +17,20 @@ jacocoTestReport {
dependencies { dependencies {
testImplementation 'org.slf4j:slf4j-simple:1.7.36' testImplementation 'org.slf4j:slf4j-simple:1.7.36'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.13.0'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1' testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'org.testcontainers:junit-jupiter:1.20.4'
testImplementation 'org.mockito:mockito-core:5.11.0' testImplementation 'org.testcontainers:junit-jupiter:1.21.1'
testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0' testImplementation 'org.mockito:mockito-core:5.18.0'
testImplementation 'com.h2database:h2:2.1.214' testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
testImplementation 'org.mongodb:mongodb-driver-legacy:4.5.0'
testImplementation 'org.spongepowered:configurate-yaml:3.7.2' testImplementation 'com.h2database:h2:2.3.232'
testImplementation 'org.spongepowered:configurate-hocon:3.7.2' testImplementation 'org.mongodb:mongodb-driver-legacy:5.5.0'
testImplementation 'org.spongepowered:configurate-yaml:3.7.3'
testImplementation 'org.spongepowered:configurate-hocon:3.7.3'
testImplementation 'me.lucko.configurate:configurate-toml:3.7' testImplementation 'me.lucko.configurate:configurate-toml:3.7'
testImplementation 'net.luckperms:rest-api-java-client:0.1-SNAPSHOT' testImplementation 'net.luckperms:rest-api-java-client:0.1'
api project(':api') api project(':api')
api 'org.checkerframework:checker-qual:3.12.0' api 'org.checkerframework:checker-qual:3.12.0'
@@ -74,32 +76,32 @@ dependencies {
api 'com.google.code.gson:gson:2.7' api 'com.google.code.gson:gson:2.7'
api 'com.google.guava:guava:19.0' api 'com.google.guava:guava:19.0'
api 'com.github.ben-manes.caffeine:caffeine:2.9.0' api 'com.github.ben-manes.caffeine:caffeine:3.2.0'
api 'com.squareup.okhttp3:okhttp:3.14.9' api 'com.squareup.okhttp3:okhttp:3.14.9'
api 'com.squareup.okio:okio:1.17.5' api 'com.squareup.okio:okio:1.17.6'
api 'net.bytebuddy:byte-buddy:1.10.22' api 'net.bytebuddy:byte-buddy:1.17.5'
api('org.spongepowered:configurate-core:3.7.2') { api('org.spongepowered:configurate-core:3.7.3') {
transitive = false transitive = false
} }
api('org.spongepowered:configurate-yaml:3.7.2') { api('org.spongepowered:configurate-yaml:3.7.3') {
transitive = false transitive = false
} }
api('org.spongepowered:configurate-gson:3.7.2') { api('org.spongepowered:configurate-gson:3.7.3') {
transitive = false transitive = false
} }
api('org.spongepowered:configurate-hocon:3.7.2') { api('org.spongepowered:configurate-hocon:3.7.3') {
transitive = false transitive = false
} }
api('me.lucko.configurate:configurate-toml:3.7') { api('me.lucko.configurate:configurate-toml:3.7') {
transitive = false transitive = false
} }
compileOnly 'com.zaxxer:HikariCP:4.0.3' compileOnly 'com.zaxxer:HikariCP:6.3.0'
compileOnly 'redis.clients:jedis:4.4.3' compileOnly 'redis.clients:jedis:6.0.0'
compileOnly 'io.nats:jnats:2.16.4' compileOnly 'io.nats:jnats:2.21.1'
compileOnly 'com.rabbitmq:amqp-client:5.12.0' compileOnly 'com.rabbitmq:amqp-client:5.25.0'
compileOnly 'org.mongodb:mongodb-driver-legacy:4.5.0' compileOnly 'org.mongodb:mongodb-driver-legacy:5.5.0'
compileOnly 'org.postgresql:postgresql:42.6.0' compileOnly 'org.postgresql:postgresql:42.7.6'
compileOnly 'org.yaml:snakeyaml:1.28' compileOnly 'org.yaml:snakeyaml:1.33'
compileOnly 'net.luckperms:rest-api-java-client:0.1-SNAPSHOT' compileOnly 'net.luckperms:rest-api-java-client:0.1'
} }

108
common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java
View File

@@ -44,14 +44,14 @@ public enum Dependency {
ASM( ASM(
"org.ow2.asm", "org.ow2.asm",
"asm", "asm",
"9.1", "9.8",
"zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=" "h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE="
), ),
ASM_COMMONS( ASM_COMMONS(
"org.ow2.asm", "org.ow2.asm",
"asm-commons", "asm-commons",
"9.1", "9.8",
"r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=" "MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ="
), ),
JAR_RELOCATOR( JAR_RELOCATOR(
"me.lucko", "me.lucko",
@@ -97,15 +97,15 @@ public enum Dependency {
CAFFEINE( CAFFEINE(
"com{}github{}ben-manes{}caffeine", "com{}github{}ben-manes{}caffeine",
"caffeine", "caffeine",
"2.9.0", "3.2.0",
"VFMotEO3XLbTHfRKfL3m36GlN72E/dzRFH9B5BJiX2o=", "7EEd/fDAPyUhhkjOiYYWMLcWgOWFippyeOusjlXKs9c=",
Relocation.of("caffeine", "com{}github{}benmanes{}caffeine") Relocation.of("caffeine", "com{}github{}benmanes{}caffeine")
), ),
OKIO( OKIO(
"com{}squareup{}" + RelocationHelper.OKIO_STRING, "com{}squareup{}" + RelocationHelper.OKIO_STRING,
RelocationHelper.OKIO_STRING, RelocationHelper.OKIO_STRING,
"1.17.5", "1.17.6",
"Gaf/SNhtPPRJf38lD78pX0MME6Uo3Vt7ID+CGAK4hq0=", "joiwVVI8yAYT37hE1Zh0DhCtpi9L2YMEzdFAxYVMw7Y=",
Relocation.of(RelocationHelper.OKIO_STRING, RelocationHelper.OKIO_STRING) Relocation.of(RelocationHelper.OKIO_STRING, RelocationHelper.OKIO_STRING)
), ),
OKHTTP( OKHTTP(
@@ -119,8 +119,8 @@ public enum Dependency {
BYTEBUDDY( BYTEBUDDY(
"net{}bytebuddy", "net{}bytebuddy",
"byte-buddy", "byte-buddy",
"1.10.22", "1.17.5",
"+TGtxDkxd6+lJExHJXqDlV4n/gR8QJN4xu2gkPsHSoQ=", "cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=",
Relocation.of("bytebuddy", "net{}bytebuddy") Relocation.of("bytebuddy", "net{}bytebuddy")
), ),
COMMODORE( COMMODORE(
@@ -140,22 +140,22 @@ public enum Dependency {
MARIADB_DRIVER( MARIADB_DRIVER(
"org{}mariadb{}jdbc", "org{}mariadb{}jdbc",
"mariadb-java-client", "mariadb-java-client",
"3.1.3", "3.5.2",
"ESl+5lYkJsScgTh8hgFTy8ExxMPQQkktT20tl6s6HKU=", "8vPDwaO9rKad0dThzYrtB1JC/HKuQUY924LjZ7OI9q0=",
Relocation.of("mariadb", "org{}mariadb{}jdbc") Relocation.of("mariadb", "org{}mariadb{}jdbc")
), ),
MYSQL_DRIVER( MYSQL_DRIVER(
"mysql", "com{}mysql",
"mysql-connector-java", "mysql-connector-j",
"8.0.23", "9.3.0",
"/31bQCr9OcEnh0cVBaM6MEEDsjjsG3pE6JNtMynadTU=", "bI5mkrUhN22JvFYYwWzer4xhhUMp9PolZ37Qh3bFu3Y=",
Relocation.of("mysql", "com{}mysql") Relocation.of("mysql", "com{}mysql")
), ),
POSTGRESQL_DRIVER( POSTGRESQL_DRIVER(
"org{}postgresql", "org{}postgresql",
"postgresql", "postgresql",
"42.6.0", "42.7.6",
"uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE=", "8qHMA1LdXlxvZdut/ye+4Awy5DLGrQMNB0R/ilmDxCo=",
Relocation.of("postgresql", "org{}postgresql") Relocation.of("postgresql", "org{}postgresql")
), ),
H2_DRIVER_LEGACY( H2_DRIVER_LEGACY(
@@ -171,132 +171,132 @@ public enum Dependency {
H2_DRIVER( H2_DRIVER(
"com.h2database", "com.h2database",
"h2", "h2",
"2.1.214", "2.3.232",
"1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=" "ja5i0i24mCw9yzgm7bnHJ8XTAgY6Z+731j2C3kAfB9M="
// we don't apply relocations to h2 - it gets loaded via // we don't apply relocations to h2 - it gets loaded via
// an isolated classloader // an isolated classloader
), ),
SQLITE_DRIVER( SQLITE_DRIVER(
"org.xerial", "org.xerial",
"sqlite-jdbc", "sqlite-jdbc",
"3.28.0", "3.49.1.0",
"k3hOVtv1RiXgbJks+D9w6cG93Vxq0dPwEwjIex2WG2A=" "XIYJ0so0HeuMb3F3iXS1ukmVx9MtfHyJ2TkqPnLDkpE="
// we don't apply relocations to sqlite - it gets loaded via // we don't apply relocations to sqlite - it gets loaded via
// an isolated classloader // an isolated classloader
), ),
HIKARI( HIKARI(
"com{}zaxxer", "com{}zaxxer",
"HikariCP", "HikariCP",
"4.0.3", "6.3.0",
"fAJK7/HBBjV210RTUT+d5kR9jmJNF/jifzCi6XaIxsk=", "B8Y0QFmvMKE1FEIJx8i9ZmuIIxJEIuyFmGTSCdSrfKE=",
Relocation.of("hikari", "com{}zaxxer{}hikari") Relocation.of("hikari", "com{}zaxxer{}hikari")
), ),
SLF4J_SIMPLE( SLF4J_SIMPLE(
"org.slf4j", "org.slf4j",
"slf4j-simple", "slf4j-simple",
"1.7.30", "1.7.36",
"i5J5y/9rn4hZTvrjzwIDm2mVAw7sAj7UOSh0jEFnD+4=" "Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8="
), ),
SLF4J_API( SLF4J_API(
"org.slf4j", "org.slf4j",
"slf4j-api", "slf4j-api",
"1.7.30", "1.7.36",
"zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=" "0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA="
), ),
MONGODB_DRIVER_CORE( MONGODB_DRIVER_CORE(
"org.mongodb", "org.mongodb",
"mongodb-driver-core", "mongodb-driver-core",
"4.5.0", "5.5.0",
"awqoW0ImUcrCTA2d1rDCjDLEjLMCrOjKWIcC7E+zLGA=", "69tQuKep52lbYvX2YM+J6GGlYkNySXkMBDuk6BqtsJE=",
Relocation.of("mongodb", "com{}mongodb"), Relocation.of("mongodb", "com{}mongodb"),
Relocation.of("bson", "org{}bson") Relocation.of("bson", "org{}bson")
), ),
MONGODB_DRIVER_LEGACY( MONGODB_DRIVER_LEGACY(
"org.mongodb", "org.mongodb",
"mongodb-driver-legacy", "mongodb-driver-legacy",
"4.5.0", "5.5.0",
"77KZGIr3KZmzBpN69rGOLXmnlJIBCXRl/U4gEIdlFhY=", "yo/0wEdLw0/Md1xqgEd/iqiKV+t0AqAcdnS1TNAaygM=",
Relocation.of("mongodb", "com{}mongodb"), Relocation.of("mongodb", "com{}mongodb"),
Relocation.of("bson", "org{}bson") Relocation.of("bson", "org{}bson")
), ),
MONGODB_DRIVER_SYNC( MONGODB_DRIVER_SYNC(
"org.mongodb", "org.mongodb",
"mongodb-driver-sync", "mongodb-driver-sync",
"4.5.0", "5.5.0",
"q9XDSGJjlo/Ek6jHoCbqWnaK/dghB8y9aDM0hCLiSvk=", "nFECiREXgMc5Ikamvmnzaxumhz75NKG+ajIhAW/ioPI=",
Relocation.of("mongodb", "com{}mongodb"), Relocation.of("mongodb", "com{}mongodb"),
Relocation.of("bson", "org{}bson") Relocation.of("bson", "org{}bson")
), ),
MONGODB_DRIVER_BSON( MONGODB_DRIVER_BSON(
"org.mongodb", "org.mongodb",
"bson", "bson",
"4.5.0", "5.5.0",
"6CFyEzxbdeiBEXdDBmcgqWs5dvicgFkBLU3MlQUIqRA=", "hQx5w0v/DuQvASpnGXkLuWxkhXhewDTTAmrifPWbBJQ=",
Relocation.of("mongodb", "com{}mongodb"), Relocation.of("mongodb", "com{}mongodb"),
Relocation.of("bson", "org{}bson") Relocation.of("bson", "org{}bson")
), ),
JEDIS( JEDIS(
"redis.clients", "redis.clients",
"jedis", "jedis",
"4.4.3", "6.0.0",
"wwwoCDPCywcfoNwpvwP95kXYusXSTtXhuVrB31sxE0k=", "ZJq2D7GDoNQa7nAsfhCTsClsedbEp3N2j2V3qXhk8kU=",
Relocation.of("jedis", "redis{}clients{}jedis"), Relocation.of("jedis", "redis{}clients{}jedis"),
Relocation.of("commonspool2", "org{}apache{}commons{}pool2") Relocation.of("commonspool2", "org{}apache{}commons{}pool2")
), ),
NATS( NATS(
"io.nats", "io.nats",
"jnats", "jnats",
"2.16.4", "2.21.1",
"/WZgFi9iJToRGIiGoShlwE5aHwstOuNGZyr4UaBRilM=", "QHUHUCnCCy/oRSwoqhy0245SrvD4lwCfc+ZVmemHXLg=",
Relocation.of("nats", "io{}nats{}client") Relocation.of("nats", "io{}nats{}client")
), ),
RABBITMQ( RABBITMQ(
"com{}rabbitmq", "com{}rabbitmq",
"amqp-client", "amqp-client",
"5.12.0", "5.25.0",
"CxliwVWAnPKi5BwxCu1S1SGzx5fbhTk5JCKdBS27P2c=", "WqlvAFCEE56xB32UtV3GQo7KfafizFPqtEp3M5H4qo8=",
Relocation.of("rabbitmq", "com{}rabbitmq") Relocation.of("rabbitmq", "com{}rabbitmq")
), ),
COMMONS_POOL_2( COMMONS_POOL_2(
"org.apache.commons", "org.apache.commons",
"commons-pool2", "commons-pool2",
"2.9.0", "2.12.1",
"vJGbQmv6+zHsxF1mUqnxN0YkZdhJ+zhz142Qw/jTWwE=", "UnPIvIwNyiIRF1wNJ++9cijvrplomqwAGo4e+Ohy6e8=",
Relocation.of("commonspool2", "org{}apache{}commons{}pool2") Relocation.of("commonspool2", "org{}apache{}commons{}pool2")
), ),
CONFIGURATE_CORE( CONFIGURATE_CORE(
"org{}spongepowered", "org{}spongepowered",
"configurate-core", "configurate-core",
"3.7.2", "3.7.3",
"XF2LzWLkSV0wyQRDt33I+gDlf3t2WzxH1h8JCZZgPp4=", "06R3WDViB84WtSkHTudV8TSPxF1eQyCyfab8L7Pvo2M=",
Relocation.of("configurate", "ninja{}leaping{}configurate") Relocation.of("configurate", "ninja{}leaping{}configurate")
), ),
CONFIGURATE_GSON( CONFIGURATE_GSON(
"org{}spongepowered", "org{}spongepowered",
"configurate-gson", "configurate-gson",
"3.7.2", "3.7.3",
"9S/mp3Ig9De7NNd6+2kX+L4R90bHnAosSNVbFjrl7sM=", "QM+bGrgrzfwT9nvIvTHtR2TUEpun+RwlXIO/a9BU0Mc=",
Relocation.of("configurate", "ninja{}leaping{}configurate") Relocation.of("configurate", "ninja{}leaping{}configurate")
), ),
CONFIGURATE_YAML( CONFIGURATE_YAML(
"org{}spongepowered", "org{}spongepowered",
"configurate-yaml", "configurate-yaml",
"3.7.2", "3.7.3",
"OBfYn4nSMGZfVf2DoZhZq+G9TF1mODX/C5OOz/mkPmc=", "a04vRkLhigIqiG/gdVvK7c1YiBQJ7k1q/kBNsS9OVDs=",
Relocation.of("configurate", "ninja{}leaping{}configurate") Relocation.of("configurate", "ninja{}leaping{}configurate")
), ),
SNAKEYAML( SNAKEYAML(
"org.yaml", "org.yaml",
"snakeyaml", "snakeyaml",
"1.28", "1.33",
"NURqFCFDXUXkxqwN47U3hSfVzCRGwHGD4kRHcwzh//o=", "Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=",
Relocation.of("yaml", "org{}yaml{}snakeyaml") Relocation.of("yaml", "org{}yaml{}snakeyaml")
), ),
CONFIGURATE_HOCON( CONFIGURATE_HOCON(
"org{}spongepowered", "org{}spongepowered",
"configurate-hocon", "configurate-hocon",
"3.7.2", "3.7.3",
"GOORZlK1FKLzdIm7dKyyXtBdvk7Z89HARAd2H6NiWSY=", "e/UDpbIrWdJNB6yMFXtrOnnNn3nptmSv/J8n46uQPNs=",
Relocation.of("configurate", "ninja{}leaping{}configurate"), Relocation.of("configurate", "ninja{}leaping{}configurate"),
Relocation.of("hocon", "com{}typesafe{}config") Relocation.of("hocon", "com{}typesafe{}config")
), ),

2
forge/build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
alias(libs.plugins.forgegradle) alias(libs.plugins.forgegradle)
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
blossom { blossom {

2
forge/forge-api/build.gradle
View File

@@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.forgegradle) alias(libs.plugins.forgegradle)
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
minecraft { minecraft {

2
forge/loader/build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
id("java-library") id("java-library")
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
minecraft { minecraft {

2
neoforge/build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
alias(libs.plugins.moddevgradle) alias(libs.plugins.moddevgradle)
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
Configuration shade = configurations.create('shade') Configuration shade = configurations.create('shade')

2
neoforge/loader/build.gradle
View File

@@ -9,7 +9,7 @@ plugins {
id("java-library") id("java-library")
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
neoForge { neoForge {

2
sponge/build.gradle
View File

@@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.shadow) alias(libs.plugins.shadow)
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
repositories { repositories {

2
sponge/loader/build.gradle
View File

@@ -2,7 +2,7 @@ plugins {
alias(libs.plugins.shadow) alias(libs.plugins.shadow)
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
repositories { repositories {

2
sponge/sponge-service-proxy/build.gradle
View File

@@ -2,7 +2,7 @@ repositories {
maven { url 'https://repo.spongepowered.org/repository/maven-public/' } maven { url 'https://repo.spongepowered.org/repository/maven-public/' }
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
dependencies { dependencies {

2
sponge/sponge-service/build.gradle
View File

@@ -2,7 +2,7 @@ repositories {
maven { url 'https://repo.spongepowered.org/repository/maven-public/' } maven { url 'https://repo.spongepowered.org/repository/maven-public/' }
} }
sourceCompatibility = 17 sourceCompatibility = 21
targetCompatibility = 21 targetCompatibility = 21
dependencies { dependencies {