Skip to content

Updates & Fixes #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2023
Merged

Updates & Fixes #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dc396b
Updates & Fixes
Im-Fran Mar 21, 2023
81d60f8
Update CHANGELOG.md
Im-Fran Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v0.2.1 - Snapshot
* Removed bundled kotlin
* Added blossom settings
* Updated dependencies

## v0.2.0 - Snapshot
* Added to sonatype
* Updated Dependencies
Expand Down
11 changes: 10 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ val env = project.rootProject.file(".env").let { file ->
if(file.exists()) file.readLines().filter { it.isNotBlank() && !it.startsWith("#") && it.split("=").size == 2 }.associate { it.split("=")[0] to it.split("=")[1] } else emptyMap()
}.toMutableMap().apply { putAll(System.getenv()) }

val projectVersion = env["VERSION"] ?: "0.2.0-SNAPSHOT"
val projectVersion = env["VERSION"] ?: "0.2.1-SNAPSHOT"

group = "xyz.theprogramsrc"
version = projectVersion
Expand All @@ -40,6 +40,14 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
}

blossom {
replaceToken("@name@", rootProject.name)
replaceToken("@version@", project.version.toString())
replaceToken("@description@", project.description)
replaceToken("@git_short@", env["GIT_COMMIT_SHORT_HASH"] ?: "unknown")
replaceToken("@git_full@", env["GIT_COMMIT_LONG_HASH"] ?: "unknown")
}


tasks {
named<ShadowJar>("shadowJar") {
Expand All @@ -49,6 +57,7 @@ tasks {
mergeServiceFiles()
exclude("**/*.kotlin_metadata")
exclude("**/*.kotlin_builtins")
exclude("kotlin/**")

archiveBaseName.set("FilesModule")
archiveClassifier.set("")
Expand Down