mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-08-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix gradle dependency stuff

Browse Source
This commit is contained in:
dfsek 2021-07-21 16:18:06 -07:00
parent 7932a97985
commit af1520eb83
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt
View File

@ -33,6 +33,6 @@ fun Project.configureDependencies() {
dependencies { dependencies {
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0") "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
"testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0") "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
"api"("org.jetbrains:annotations:20.1.0") "compileOnly"("org.jetbrains:annotations:20.1.0")
} }
} }

5
buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt
View File

@ -123,12 +123,7 @@ fun Project.configureDistribution() {
archiveClassifier.set("shaded") archiveClassifier.set("shaded")
setVersion(project.version) setVersion(project.version)
relocate("org.apache.commons", "com.dfsek.terra.lib.commons") relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
relocate("net.jafama", "com.dfsek.terra.lib.jafama")
relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm") relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
relocate("com.google.errorprone", "com.dfsek.terra.lib.google.errorprone")
relocate("com.google.j2objc", "com.dfsek.terra.lib.google.j2objc")
relocate("org.checkerframework", "com.dfsek.terra.lib.checkerframework")
relocate("org.javax.annotation", "com.dfsek.terra.lib.javax.annotation")
relocate("org.json", "com.dfsek.terra.lib.json") relocate("org.json", "com.dfsek.terra.lib.json")
relocate("org.yaml", "com.dfsek.terra.lib.yaml") relocate("org.yaml", "com.dfsek.terra.lib.yaml")
} }

3
common/api/build.gradle.kts
View File

@ -19,9 +19,6 @@ dependencies {
"shadedApi"("com.dfsek.tectonic:yaml:2.1.2") "shadedApi"("com.dfsek.tectonic:yaml:2.1.2")
"shadedApi"("net.jafama:jafama:2.3.2") "shadedApi"("net.jafama:jafama:2.3.2")
"shadedApi"("org.yaml:snakeyaml:1.27")
"shadedApi"("org.ow2.asm:asm:9.0")
"compileOnly"("com.google.guava:guava:30.0-jre") "compileOnly"("com.google.guava:guava:30.0-jre")

4
common/implementation/build.gradle.kts
View File

@ -18,11 +18,11 @@ dependencies {
"shadedApi"(project(":common:loader:addon")) "shadedApi"(project(":common:loader:addon"))
"shadedApi"("org.apache.commons:commons-rng-core:1.3") "shadedApi"("org.apache.commons:commons-rng-core:1.3")
"shadedApi"("commons-io:commons-io:2.6") "shadedApi"("commons-io:commons-io:2.6")
"shadedImplementation"("org.apache.commons:commons-text:1.9") "shadedImplementation"("org.apache.commons:commons-text:1.9")
"shadedImplementation"("org.yaml:snakeyaml:1.27")
"shadedImplementation"("org.ow2.asm:asm:9.0")
"compileOnly"("com.google.guava:guava:30.0-jre") "compileOnly"("com.google.guava:guava:30.0-jre")