Skip to content

Commit

Permalink
Simplify output by removing version specific tag
Browse files Browse the repository at this point in the history
  • Loading branch information
Jire committed Feb 10, 2023
1 parent 1c00a2e commit 5955ca5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ jobs:
- uses: actions/upload-artifact@v3
with:
name: overwatcheat
path: "build/Overwatcheat 5.1.0"
path: "build/Overwatcheat"
if-no-files-found: error
11 changes: 5 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ tasks {

fun TaskContainerScope.configureShadowJar() {
shadowJar {
archiveBaseName.set("Overwatcheat")
archiveBaseName.set("overwatcheat")
archiveClassifier.set("")
archiveVersion.set("${project.version}")
archiveVersion.set("")

isZip64 = true
//minimize() // needs to be updated for Java 19 support
Expand Down Expand Up @@ -96,8 +96,7 @@ fun TaskContainerScope.configureOverwatcheat() {
register("overwatcheat") {
dependsOn(shadowJar)
doLast {
val version = version
val name = "Overwatcheat $version"
val name = "overwatcheat"

val buildDir = file("build/")

Expand All @@ -107,7 +106,7 @@ fun TaskContainerScope.configureOverwatcheat() {

val jarName = "${name}.jar"
val jar = dir.resolve(jarName)
val allJar = buildDir.resolve("libs/Overwatcheat-${version}.jar")
val allJar = buildDir.resolve("libs/overwatcheat.jar")
allJar.copyTo(jar, true)

dir.writeStartBat(name, jarName)
Expand All @@ -122,7 +121,7 @@ fun TaskContainerScope.configureOverwatcheat() {
}

fun File.writeStartBat(name: String, jarName: String) =
resolve("Start ${name}.bat")
resolve("run.bat")
.writeText(
"""@echo off
cd /d "%~dp0"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.gradle.jvmargs=-Xmx1g
org.gradle.jvmargs=-Xmx2g
org.gradle.warning.mode=all

0 comments on commit 5955ca5

Please sign in to comment.