Skip to content

Commit af1520e

Browse files
committed
fix gradle dependency stuff
1 parent 7932a97 commit af1520e

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ fun Project.configureDependencies() {
3333
dependencies {
3434
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
3535
"testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
36-
"api"("org.jetbrains:annotations:20.1.0")
36+
"compileOnly"("org.jetbrains:annotations:20.1.0")
3737
}
3838
}

buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,7 @@ fun Project.configureDistribution() {
123123
archiveClassifier.set("shaded")
124124
setVersion(project.version)
125125
relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
126-
relocate("net.jafama", "com.dfsek.terra.lib.jafama")
127126
relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
128-
relocate("com.google.errorprone", "com.dfsek.terra.lib.google.errorprone")
129-
relocate("com.google.j2objc", "com.dfsek.terra.lib.google.j2objc")
130-
relocate("org.checkerframework", "com.dfsek.terra.lib.checkerframework")
131-
relocate("org.javax.annotation", "com.dfsek.terra.lib.javax.annotation")
132127
relocate("org.json", "com.dfsek.terra.lib.json")
133128
relocate("org.yaml", "com.dfsek.terra.lib.yaml")
134129
}

common/api/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ dependencies {
1919
"shadedApi"("com.dfsek.tectonic:yaml:2.1.2")
2020

2121
"shadedApi"("net.jafama:jafama:2.3.2")
22-
"shadedApi"("org.yaml:snakeyaml:1.27")
23-
"shadedApi"("org.ow2.asm:asm:9.0")
24-
2522

2623
"compileOnly"("com.google.guava:guava:30.0-jre")
2724

common/implementation/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ dependencies {
1818
"shadedApi"(project(":common:loader:addon"))
1919

2020
"shadedApi"("org.apache.commons:commons-rng-core:1.3")
21-
2221
"shadedApi"("commons-io:commons-io:2.6")
23-
2422
"shadedImplementation"("org.apache.commons:commons-text:1.9")
2523

24+
"shadedImplementation"("org.yaml:snakeyaml:1.27")
25+
"shadedImplementation"("org.ow2.asm:asm:9.0")
2626

2727
"compileOnly"("com.google.guava:guava:30.0-jre")
2828

0 commit comments

Comments
 (0)