diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68b8c9a..e19bea5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,9 @@ build_test: - gradle --build-cache build :launcher-dist:publish -Pflavor=macos -Pdist.platformOnly -Ppublic -Ptimestamp=$TIMESTAMP - gradle --build-cache :exportMetadata -Ppublic -Ptimestamp=$TIMESTAMP - mkdir -p build/libs - - cp launcher-shadowed/build/libs/* build/libs/ + - cp launcher-dist/build/libs/* build/libs/ - cp wrapper/build/libs/* build/libs/ - - cp launcher-shadowed/build/libs/*-*-*-*.jar ./ + - cp launcher-dist/build/libs/*-*-*-*.jar ./ - cp wrapper/build/libs/*.exe wrapper.exe - cp wrapper/build/libs/*-all.jar wrapper.jar - for f in *-*-*.jar; do mv "$f" "latest-${f##*-}";done diff --git a/build.gradle.kts b/build.gradle.kts index c9b398e..226beaf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,8 +16,6 @@ if (File(".git").exists()) { } } -println("Building Inceptum $currentVer") - val timestamp: Long = if (project.hasProperty("timestamp")) "${project.property("timestamp")}".toLong() else (System.currentTimeMillis() / 1000L) @@ -26,6 +24,8 @@ allprojects { group = "io.gitlab.jfronny.inceptum" } +println("Building Inceptum $version") + val lwjglVersion by extra("3.3.1") val imguiVersion by extra("1.86.4") val logbackVersion by extra("1.3.0-alpha15")