Cherry-pick build-script changes from upstream

This commit is contained in:
MattBDev
2021-02-11 11:59:03 -05:00
parent 8981a5c484
commit 20304bf7ad
6 changed files with 42 additions and 61 deletions

View File

@ -30,18 +30,6 @@ repositories {
}
}
}
/*
configurations.all {
resolutionStrategy {
// Fabric needs this.
force(
"commons-io:commons-io:2.6",
"org.ow2.asm:asm:8.0.1",
"org.ow2.asm:asm-commons:8.0.1"
)
}
}
*/
val properties = Properties().also { props ->
project.projectDir.resolveSibling("gradle.properties").bufferedReader().use {
@ -57,12 +45,11 @@ dependencies {
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
/*
implementation("gradle.plugin.com.mendhak.gradlecrowdin:plugin:0.1.0")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.16.0")
implementation("gradle.plugin.org.spongepowered:spongegradle:0.9.0")
implementation("net.minecraftforge.gradle:ForgeGradle:3.0.181")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.19.0")
implementation("org.spongepowered:SpongeGradle:0.11.5")
implementation("net.minecraftforge.gradle:ForgeGradle:4.0.9")
implementation("net.fabricmc:fabric-loom:$loomVersion")
implementation("net.fabricmc:sponge-mixin:$mixinVersion")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")
*/
}

View File

@ -27,11 +27,6 @@ fun Project.applyPlatformAndCoreConfiguration() {
ext["internalVersion"] = "$version;${rootProject.ext["gitCommitHash"]}"
configure<JavaPluginConvention> {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = sourceCompatibility
}
tasks
.withType<JavaCompile>()
.matching { it.name == "compileJava" || it.name == "compileTestJava" }
@ -55,11 +50,11 @@ fun Project.applyPlatformAndCoreConfiguration() {
dependencies {
"compileOnly"("org.jetbrains:annotations:20.1.0")
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.6.1")
"testImplementation"("org.junit.jupiter:junit-jupiter-params:5.6.1")
"testImplementation"("org.mockito:mockito-core:3.3.3")
"testImplementation"("org.mockito:mockito-junit-jupiter:3.3.3")
"testRuntime"("org.junit.jupiter:junit-jupiter-engine:5.6.1")
"testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}")
"testImplementation"("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT}")
"testImplementation"("org.mockito:mockito-core:${Versions.MOCKITO}")
"testImplementation"("org.mockito:mockito-junit-jupiter:${Versions.MOCKITO}")
"testRuntime"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
}
// Java 8 turns on doclint which we fail