Upgrade many items, Gradle 8.1.1 (#2329)

* Upgrade many items, Gradle 8.1.1

* Bump to codecov snapshot

* Use the release of the codecov plugin

---------

Co-authored-by: Madeline Miller <mnmiller1@me.com>
This commit is contained in:
Octavia Togami 2023-06-03 22:40:08 -07:00 committed by GitHub
parent bd9af40e83
commit 9667101730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 33 additions and 27 deletions

View File

@ -29,15 +29,6 @@
}
}
// Work around https://github.com/gradle/gradle/issues/4823
subprojects {
if (buildscript.sourceFile?.extension?.toLowerCase() == "kts"
&& parent != rootProject) {
generateSequence(parent) { project -> project.parent.takeIf { it != rootProject } }
.forEach { evaluationDependsOn(it.path) }
}
}
logger.lifecycle("""
*******************************************
You are building WorldEdit!

View File

@ -48,14 +48,14 @@
implementation(gradleApi())
implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1")
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1")
implementation("com.github.johnrengelman:shadow:8.1.1")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0")
implementation("org.spongepowered:spongegradle-plugin-development:2.0.2")
implementation("org.spongepowered:vanillagradle:0.2.1-20220619.210040-41")
implementation("net.minecraftforge.gradle:ForgeGradle:5.1.68")
implementation("net.minecraftforge.gradle:ForgeGradle:6.0.4")
implementation("net.fabricmc:fabric-loom:$loomVersion")
implementation("net.fabricmc:sponge-mixin:$mixinVersion")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
implementation("org.spongepowered:mixingradle:0.7.32")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5")
implementation("org.spongepowered:mixingradle:0.7.33")
}

View File

@ -4,5 +4,5 @@ version=7.2.15-SNAPSHOT
org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true
loom.version=1.1-SNAPSHOT
mixin.version=0.11.4+mixin.0.8.5
loom.version=1.1.14
mixin.version=0.12.5+mixin.0.8.5

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@ -1,5 +1,7 @@
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
applyPaperweightAdapterConfiguration()
dependencies {
paperDevBundle("1.17.1-R0.1-20220414.034903-210")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.17.1-R0.1-20220414.034903-210")
}

View File

@ -1,6 +1,8 @@
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
applyPaperweightAdapterConfiguration()
dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
paperDevBundle("1.18.2-R0.1-20220304.102823-4")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.18.2-R0.1-20220304.102823-4")
}

View File

@ -1,6 +1,8 @@
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
applyPaperweightAdapterConfiguration()
dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
paperDevBundle("1.19.3-R0.1-20221226.180038-55")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.3-R0.1-20221226.180038-55")
}

View File

@ -1,6 +1,8 @@
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
applyPaperweightAdapterConfiguration()
dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
paperDevBundle("1.19.4-R0.1-20230315.180941-2")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230315.180941-2")
}

View File

@ -1,6 +1,8 @@
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
applyPaperweightAdapterConfiguration()
dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
paperDevBundle("1.19-R0.1-20220609.175204-1")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19-R0.1-20220609.175204-1")
}

View File

@ -1,14 +1,14 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.5.30"
kotlin("jvm") version "1.8.20"
application
}
applyCommonConfiguration()
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "17"
}
application.mainClass.set("com.sk89q.worldedit.internal.util.DocumentationPrinter")

View File

@ -22,7 +22,7 @@
apply(plugin = "java-library")
val minecraftVersion = "1.19.4"
val loaderVersion = "0.14.17"
val loaderVersion = "0.14.21"
val fabricApiConfiguration: Configuration = configurations.create("fabricApi")
@ -35,6 +35,11 @@
name = "Fabric"
url = uri("https://maven.fabricmc.net/")
}
getByName("Mojang") {
content {
includeGroupByRegex("com\\.mojang\\..*")
}
}
}
dependencies {
@ -48,7 +53,7 @@
"modImplementation"("net.fabricmc:fabric-loader:$loaderVersion")
// [1] declare fabric-api dependency...
"fabricApi"("net.fabricmc.fabric-api:fabric-api:0.75.2+1.19.4")
"fabricApi"("net.fabricmc.fabric-api:fabric-api:0.83.0+1.19.4")
// [2] Load the API dependencies from the fabric mod json...
@Suppress("UNCHECKED_CAST")