diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-16 12:34:18 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-16 12:34:18 +0200 |
| commit | 4293cfd919c3c93d4532534f722c407d7ad1370d (patch) | |
| tree | f9f612f021ef7f4283d74312edfaca30badc6749 /build.gradle.kts | |
| parent | 538e3ceb76f8e0b590291ce9aa90aa94896cdcb6 (diff) | |
| parent | 024ba52fb69b6cd44b4e31542867f802de656f15 (diff) | |
| download | SkyHanni-cum.tar.gz SkyHanni-cum.tar.bz2 SkyHanni-cum.zip | |
Merge branch 'beta' into cumcum
# Conflicts:
# src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
# src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
Diffstat (limited to 'build.gradle.kts')
| -rw-r--r-- | build.gradle.kts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index b98a63bf1..31b4348b3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "at.hannibal2.skyhanni" -version = "0.20.Beta.13" +version = "0.20.Beta.20" // Toolchains: java { @@ -19,7 +19,7 @@ java { } sourceSets.main { - output.setResourcesDir(file("$buildDir/classes/java/main")) + output.setResourcesDir(file("$buildDir/classes/kotlin/main")) } repositories { @@ -34,6 +34,7 @@ repositories { } } maven("https://repo.nea.moe/releases") + maven("https://maven.notenoughupdates.org/releases") } val shadowImpl by configurations.creating { @@ -87,10 +88,10 @@ dependencies { isTransitive = false } - shadowModImpl("com.github.NotEnoughUpdates:MoulConfig:1.1.5") - devenvMod("com.github.NotEnoughUpdates:MoulConfig:1.1.5:test") + shadowModImpl(libs.moulconfig) + devenvMod(variantOf(libs.moulconfig) { classifier("test") }) - shadowImpl("moe.nea:libautoupdate:1.0.3") + shadowImpl(libs.libautoupdate) shadowImpl("org.jetbrains.kotlin:kotlin-reflect:1.9.0") // testImplementation(kotlin("test")) |