mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-19 05:32:55 +00:00
Code Issues Releases Wiki Activity

Enforce version bounds for the Kotlin stdlib

Browse Source 
We were pulling in an ancient version of the jdk8 stdlib via
kotlinx.coroutines, hence the conflict in versions.
This commit is contained in:
Jonathan Coates 2023-01-17 20:28:31 +00:00
parent db6b6fd173
commit 86b60855d6
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gradle/libs.versions.toml
View File

@ -73,6 +73,7 @@ forgeSpi = { module = "net.minecraftforge:forgespi", version.ref = "forgeSpi" }
guava = { module = "com.google.guava:guava", version.ref = "guava" } guava = { module = "com.google.guava:guava", version.ref = "guava" }
jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" } jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" }
jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" } jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
kotlin-platform = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" } kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
netty-http = { module = "io.netty:netty-codec-http", version.ref = "netty" } netty-http = { module = "io.netty:netty-codec-http", version.ref = "netty" }

1
projects/core/build.gradle.kts
View File

@ -20,6 +20,7 @@ dependencies {
implementation(libs.asm) implementation(libs.asm)
testFixturesImplementation(libs.slf4j) testFixturesImplementation(libs.slf4j)
testFixturesApi(platform(libs.kotlin.platform))
testFixturesApi(libs.bundles.test) testFixturesApi(libs.bundles.test)
testFixturesApi(libs.bundles.kotlin) testFixturesApi(libs.bundles.kotlin)

1
projects/forge/build.gradle.kts
View File

@ -155,7 +155,6 @@ dependencies {
testImplementation(testFixtures(project(":core"))) testImplementation(testFixtures(project(":core")))
testImplementation(libs.bundles.test) testImplementation(libs.bundles.test)
testImplementation(libs.bundles.kotlin)
testRuntimeOnly(libs.bundles.testRuntime) testRuntimeOnly(libs.bundles.testRuntime)
testModImplementation(testFixtures(project(":core"))) testModImplementation(testFixtures(project(":core")))