From 9538cb9dad23ccf0be894e76df3af5562b771308 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 1 Jun 2025 16:41:39 +0100 Subject: [PATCH] Upgrade dependencies and require Java 11 --- api/build.gradle | 3 + build.gradle | 4 +- common/build.gradle | 54 ++++----- .../common/dependencies/Dependency.java | 108 +++++++++--------- forge/build.gradle | 2 +- forge/forge-api/build.gradle | 2 +- forge/loader/build.gradle | 2 +- neoforge/build.gradle | 2 +- neoforge/loader/build.gradle | 2 +- sponge/build.gradle | 2 +- sponge/loader/build.gradle | 2 +- sponge/sponge-service-proxy/build.gradle | 2 +- sponge/sponge-service/build.gradle | 2 +- 13 files changed, 96 insertions(+), 91 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 821376b2d..a8e7393f7 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,6 +1,9 @@ group = 'net.luckperms' project.version = '5.5' +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + jar { manifest { attributes('Automatic-Module-Name': 'net.luckperms.api') diff --git a/build.gradle b/build.gradle index e13f30427..94d7b39ba 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ subprojects { group = 'me.lucko.luckperms' version = '5.5-SNAPSHOT' - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' diff --git a/common/build.gradle b/common/build.gradle index d3a31fa67..3e7c85b54 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -17,18 +17,20 @@ jacocoTestReport { dependencies { 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-params:5.9.1' - testImplementation 'org.testcontainers:junit-jupiter:1.20.4' - testImplementation 'org.mockito:mockito-core:5.11.0' - testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0' - testImplementation 'com.h2database:h2:2.1.214' - testImplementation 'org.mongodb:mongodb-driver-legacy:4.5.0' - testImplementation 'org.spongepowered:configurate-yaml:3.7.2' - testImplementation 'org.spongepowered:configurate-hocon:3.7.2' + + testImplementation 'org.junit.jupiter:junit-jupiter:5.13.0' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + testImplementation 'org.testcontainers:junit-jupiter:1.21.1' + testImplementation 'org.mockito:mockito-core:5.18.0' + testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0' + + testImplementation 'com.h2database:h2:2.3.232' + 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 'net.luckperms:rest-api-java-client:0.1-SNAPSHOT' + testImplementation 'net.luckperms:rest-api-java-client:0.1' api project(':api') api 'org.checkerframework:checker-qual:3.12.0' @@ -74,32 +76,32 @@ dependencies { api 'com.google.code.gson:gson:2.7' 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.okio:okio:1.17.5' - api 'net.bytebuddy:byte-buddy:1.10.22' + api 'com.squareup.okio:okio:1.17.6' + 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 } - api('org.spongepowered:configurate-yaml:3.7.2') { + api('org.spongepowered:configurate-yaml:3.7.3') { transitive = false } - api('org.spongepowered:configurate-gson:3.7.2') { + api('org.spongepowered:configurate-gson:3.7.3') { transitive = false } - api('org.spongepowered:configurate-hocon:3.7.2') { + api('org.spongepowered:configurate-hocon:3.7.3') { transitive = false } api('me.lucko.configurate:configurate-toml:3.7') { transitive = false } - compileOnly 'com.zaxxer:HikariCP:4.0.3' - compileOnly 'redis.clients:jedis:4.4.3' - compileOnly 'io.nats:jnats:2.16.4' - compileOnly 'com.rabbitmq:amqp-client:5.12.0' - compileOnly 'org.mongodb:mongodb-driver-legacy:4.5.0' - compileOnly 'org.postgresql:postgresql:42.6.0' - compileOnly 'org.yaml:snakeyaml:1.28' - compileOnly 'net.luckperms:rest-api-java-client:0.1-SNAPSHOT' + compileOnly 'com.zaxxer:HikariCP:6.3.0' + compileOnly 'redis.clients:jedis:6.0.0' + compileOnly 'io.nats:jnats:2.21.1' + compileOnly 'com.rabbitmq:amqp-client:5.25.0' + compileOnly 'org.mongodb:mongodb-driver-legacy:5.5.0' + compileOnly 'org.postgresql:postgresql:42.7.6' + compileOnly 'org.yaml:snakeyaml:1.33' + compileOnly 'net.luckperms:rest-api-java-client:0.1' } diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java index 6f35bdfcb..680c5cd18 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java @@ -44,14 +44,14 @@ public enum Dependency { ASM( "org.ow2.asm", "asm", - "9.1", - "zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=" + "9.8", + "h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=" ), ASM_COMMONS( "org.ow2.asm", "asm-commons", - "9.1", - "r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=" + "9.8", + "MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=" ), JAR_RELOCATOR( "me.lucko", @@ -97,15 +97,15 @@ public enum Dependency { CAFFEINE( "com{}github{}ben-manes{}caffeine", "caffeine", - "2.9.0", - "VFMotEO3XLbTHfRKfL3m36GlN72E/dzRFH9B5BJiX2o=", + "3.2.0", + "7EEd/fDAPyUhhkjOiYYWMLcWgOWFippyeOusjlXKs9c=", Relocation.of("caffeine", "com{}github{}benmanes{}caffeine") ), OKIO( "com{}squareup{}" + RelocationHelper.OKIO_STRING, RelocationHelper.OKIO_STRING, - "1.17.5", - "Gaf/SNhtPPRJf38lD78pX0MME6Uo3Vt7ID+CGAK4hq0=", + "1.17.6", + "joiwVVI8yAYT37hE1Zh0DhCtpi9L2YMEzdFAxYVMw7Y=", Relocation.of(RelocationHelper.OKIO_STRING, RelocationHelper.OKIO_STRING) ), OKHTTP( @@ -119,8 +119,8 @@ public enum Dependency { BYTEBUDDY( "net{}bytebuddy", "byte-buddy", - "1.10.22", - "+TGtxDkxd6+lJExHJXqDlV4n/gR8QJN4xu2gkPsHSoQ=", + "1.17.5", + "cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=", Relocation.of("bytebuddy", "net{}bytebuddy") ), COMMODORE( @@ -140,22 +140,22 @@ public enum Dependency { MARIADB_DRIVER( "org{}mariadb{}jdbc", "mariadb-java-client", - "3.1.3", - "ESl+5lYkJsScgTh8hgFTy8ExxMPQQkktT20tl6s6HKU=", + "3.5.2", + "8vPDwaO9rKad0dThzYrtB1JC/HKuQUY924LjZ7OI9q0=", Relocation.of("mariadb", "org{}mariadb{}jdbc") ), MYSQL_DRIVER( - "mysql", - "mysql-connector-java", - "8.0.23", - "/31bQCr9OcEnh0cVBaM6MEEDsjjsG3pE6JNtMynadTU=", + "com{}mysql", + "mysql-connector-j", + "9.3.0", + "bI5mkrUhN22JvFYYwWzer4xhhUMp9PolZ37Qh3bFu3Y=", Relocation.of("mysql", "com{}mysql") ), POSTGRESQL_DRIVER( "org{}postgresql", "postgresql", - "42.6.0", - "uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE=", + "42.7.6", + "8qHMA1LdXlxvZdut/ye+4Awy5DLGrQMNB0R/ilmDxCo=", Relocation.of("postgresql", "org{}postgresql") ), H2_DRIVER_LEGACY( @@ -171,132 +171,132 @@ public enum Dependency { H2_DRIVER( "com.h2database", "h2", - "2.1.214", - "1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=" + "2.3.232", + "ja5i0i24mCw9yzgm7bnHJ8XTAgY6Z+731j2C3kAfB9M=" // we don't apply relocations to h2 - it gets loaded via // an isolated classloader ), SQLITE_DRIVER( "org.xerial", "sqlite-jdbc", - "3.28.0", - "k3hOVtv1RiXgbJks+D9w6cG93Vxq0dPwEwjIex2WG2A=" + "3.49.1.0", + "XIYJ0so0HeuMb3F3iXS1ukmVx9MtfHyJ2TkqPnLDkpE=" // we don't apply relocations to sqlite - it gets loaded via // an isolated classloader ), HIKARI( "com{}zaxxer", "HikariCP", - "4.0.3", - "fAJK7/HBBjV210RTUT+d5kR9jmJNF/jifzCi6XaIxsk=", + "6.3.0", + "B8Y0QFmvMKE1FEIJx8i9ZmuIIxJEIuyFmGTSCdSrfKE=", Relocation.of("hikari", "com{}zaxxer{}hikari") ), SLF4J_SIMPLE( "org.slf4j", "slf4j-simple", - "1.7.30", - "i5J5y/9rn4hZTvrjzwIDm2mVAw7sAj7UOSh0jEFnD+4=" + "1.7.36", + "Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=" ), SLF4J_API( "org.slf4j", "slf4j-api", - "1.7.30", - "zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=" + "1.7.36", + "0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=" ), MONGODB_DRIVER_CORE( "org.mongodb", "mongodb-driver-core", - "4.5.0", - "awqoW0ImUcrCTA2d1rDCjDLEjLMCrOjKWIcC7E+zLGA=", + "5.5.0", + "69tQuKep52lbYvX2YM+J6GGlYkNySXkMBDuk6BqtsJE=", Relocation.of("mongodb", "com{}mongodb"), Relocation.of("bson", "org{}bson") ), MONGODB_DRIVER_LEGACY( "org.mongodb", "mongodb-driver-legacy", - "4.5.0", - "77KZGIr3KZmzBpN69rGOLXmnlJIBCXRl/U4gEIdlFhY=", + "5.5.0", + "yo/0wEdLw0/Md1xqgEd/iqiKV+t0AqAcdnS1TNAaygM=", Relocation.of("mongodb", "com{}mongodb"), Relocation.of("bson", "org{}bson") ), MONGODB_DRIVER_SYNC( "org.mongodb", "mongodb-driver-sync", - "4.5.0", - "q9XDSGJjlo/Ek6jHoCbqWnaK/dghB8y9aDM0hCLiSvk=", + "5.5.0", + "nFECiREXgMc5Ikamvmnzaxumhz75NKG+ajIhAW/ioPI=", Relocation.of("mongodb", "com{}mongodb"), Relocation.of("bson", "org{}bson") ), MONGODB_DRIVER_BSON( "org.mongodb", "bson", - "4.5.0", - "6CFyEzxbdeiBEXdDBmcgqWs5dvicgFkBLU3MlQUIqRA=", + "5.5.0", + "hQx5w0v/DuQvASpnGXkLuWxkhXhewDTTAmrifPWbBJQ=", Relocation.of("mongodb", "com{}mongodb"), Relocation.of("bson", "org{}bson") ), JEDIS( "redis.clients", "jedis", - "4.4.3", - "wwwoCDPCywcfoNwpvwP95kXYusXSTtXhuVrB31sxE0k=", + "6.0.0", + "ZJq2D7GDoNQa7nAsfhCTsClsedbEp3N2j2V3qXhk8kU=", Relocation.of("jedis", "redis{}clients{}jedis"), Relocation.of("commonspool2", "org{}apache{}commons{}pool2") ), NATS( "io.nats", "jnats", - "2.16.4", - "/WZgFi9iJToRGIiGoShlwE5aHwstOuNGZyr4UaBRilM=", + "2.21.1", + "QHUHUCnCCy/oRSwoqhy0245SrvD4lwCfc+ZVmemHXLg=", Relocation.of("nats", "io{}nats{}client") ), RABBITMQ( "com{}rabbitmq", "amqp-client", - "5.12.0", - "CxliwVWAnPKi5BwxCu1S1SGzx5fbhTk5JCKdBS27P2c=", + "5.25.0", + "WqlvAFCEE56xB32UtV3GQo7KfafizFPqtEp3M5H4qo8=", Relocation.of("rabbitmq", "com{}rabbitmq") ), COMMONS_POOL_2( "org.apache.commons", "commons-pool2", - "2.9.0", - "vJGbQmv6+zHsxF1mUqnxN0YkZdhJ+zhz142Qw/jTWwE=", + "2.12.1", + "UnPIvIwNyiIRF1wNJ++9cijvrplomqwAGo4e+Ohy6e8=", Relocation.of("commonspool2", "org{}apache{}commons{}pool2") ), CONFIGURATE_CORE( "org{}spongepowered", "configurate-core", - "3.7.2", - "XF2LzWLkSV0wyQRDt33I+gDlf3t2WzxH1h8JCZZgPp4=", + "3.7.3", + "06R3WDViB84WtSkHTudV8TSPxF1eQyCyfab8L7Pvo2M=", Relocation.of("configurate", "ninja{}leaping{}configurate") ), CONFIGURATE_GSON( "org{}spongepowered", "configurate-gson", - "3.7.2", - "9S/mp3Ig9De7NNd6+2kX+L4R90bHnAosSNVbFjrl7sM=", + "3.7.3", + "QM+bGrgrzfwT9nvIvTHtR2TUEpun+RwlXIO/a9BU0Mc=", Relocation.of("configurate", "ninja{}leaping{}configurate") ), CONFIGURATE_YAML( "org{}spongepowered", "configurate-yaml", - "3.7.2", - "OBfYn4nSMGZfVf2DoZhZq+G9TF1mODX/C5OOz/mkPmc=", + "3.7.3", + "a04vRkLhigIqiG/gdVvK7c1YiBQJ7k1q/kBNsS9OVDs=", Relocation.of("configurate", "ninja{}leaping{}configurate") ), SNAKEYAML( "org.yaml", "snakeyaml", - "1.28", - "NURqFCFDXUXkxqwN47U3hSfVzCRGwHGD4kRHcwzh//o=", + "1.33", + "Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=", Relocation.of("yaml", "org{}yaml{}snakeyaml") ), CONFIGURATE_HOCON( "org{}spongepowered", "configurate-hocon", - "3.7.2", - "GOORZlK1FKLzdIm7dKyyXtBdvk7Z89HARAd2H6NiWSY=", + "3.7.3", + "e/UDpbIrWdJNB6yMFXtrOnnNn3nptmSv/J8n46uQPNs=", Relocation.of("configurate", "ninja{}leaping{}configurate"), Relocation.of("hocon", "com{}typesafe{}config") ), diff --git a/forge/build.gradle b/forge/build.gradle index 46232d242..0eb9cd8c2 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.forgegradle) } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 blossom { diff --git a/forge/forge-api/build.gradle b/forge/forge-api/build.gradle index 603d1f678..e846d9dbd 100644 --- a/forge/forge-api/build.gradle +++ b/forge/forge-api/build.gradle @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.forgegradle) } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 minecraft { diff --git a/forge/loader/build.gradle b/forge/loader/build.gradle index 31dc998df..238558f8c 100644 --- a/forge/loader/build.gradle +++ b/forge/loader/build.gradle @@ -4,7 +4,7 @@ plugins { id("java-library") } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 minecraft { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 4ea4651d8..b3f7e99cb 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.moddevgradle) } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 Configuration shade = configurations.create('shade') diff --git a/neoforge/loader/build.gradle b/neoforge/loader/build.gradle index 960bf9e80..91ed452a6 100644 --- a/neoforge/loader/build.gradle +++ b/neoforge/loader/build.gradle @@ -9,7 +9,7 @@ plugins { id("java-library") } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 neoForge { diff --git a/sponge/build.gradle b/sponge/build.gradle index c27a717f3..89cdbfdf0 100644 --- a/sponge/build.gradle +++ b/sponge/build.gradle @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.shadow) } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 repositories { diff --git a/sponge/loader/build.gradle b/sponge/loader/build.gradle index 71239ce77..f35bb0072 100644 --- a/sponge/loader/build.gradle +++ b/sponge/loader/build.gradle @@ -2,7 +2,7 @@ plugins { alias(libs.plugins.shadow) } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 repositories { diff --git a/sponge/sponge-service-proxy/build.gradle b/sponge/sponge-service-proxy/build.gradle index 34ff6c369..9c0f51013 100644 --- a/sponge/sponge-service-proxy/build.gradle +++ b/sponge/sponge-service-proxy/build.gradle @@ -2,7 +2,7 @@ repositories { maven { url 'https://repo.spongepowered.org/repository/maven-public/' } } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 dependencies { diff --git a/sponge/sponge-service/build.gradle b/sponge/sponge-service/build.gradle index ddcedeb11..b881de105 100644 --- a/sponge/sponge-service/build.gradle +++ b/sponge/sponge-service/build.gradle @@ -2,7 +2,7 @@ repositories { maven { url 'https://repo.spongepowered.org/repository/maven-public/' } } -sourceCompatibility = 17 +sourceCompatibility = 21 targetCompatibility = 21 dependencies {