mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 20:20:30 +00:00
Code Issues Releases Wiki Activity

Exclude Jetbrains annotations from testModExtra

Browse Source 
testModExtra must /strictly/ be the set of dependencies which are not
present in implementation - there can't be any duplicates.

Yes, it's stupid, but the whole lazyToken("minecraft_classpath") thing
wasn't really built with this in mind, so not much we can do :)
This commit is contained in:
Jonathan Coates 2021-12-01 20:40:46 +00:00
parent 179da1d8cf
commit 87988a705b
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -166,7 +166,9 @@ dependencies {
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
testModImplementation sourceSets.main.output testModImplementation sourceSets.main.output
testModExtra 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21' testModExtra('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0') {
exclude group: "org.jetbrains", module: "annotations"
}
cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2' cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2'
} }
@ -430,8 +432,7 @@ task setupServer(type: Copy) {
if (name != "Client" || project.findProperty('cc.tweaked.clientTests') == 'true') { if (name != "Client" || project.findProperty('cc.tweaked.clientTests') == 'true') {
// Don't run client tests unless explicitly opted into them. They're a bit of a faff // Don't run client tests unless explicitly opted into them. They're a bit of a faff
// to run and pretty flakey. // to run and pretty flakey.
// check.dependsOn("jacocoTest${name}Report") check.dependsOn("jacocoTest${name}Report")
// TODO: Fix this! Doesn't load due to jetbrains annotations appearing twice
} }
} }