Skip to content

Commit b3e3f1f

Browse files
authored
Merge pull request #41 from TheProgramSrc/patch/updates
Updates & Fixes
2 parents 6e7a1de + 81d60f8 commit b3e3f1f

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## v0.2.1 - Snapshot
2+
* Removed bundled kotlin
3+
* Added blossom settings
4+
* Updated dependencies
5+
16
## v0.2.0 - Snapshot
27
* Added to sonatype
38
* Updated Dependencies

build.gradle.kts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ val env = project.rootProject.file(".env").let { file ->
1515
if(file.exists()) file.readLines().filter { it.isNotBlank() && !it.startsWith("#") && it.split("=").size == 2 }.associate { it.split("=")[0] to it.split("=")[1] } else emptyMap()
1616
}.toMutableMap().apply { putAll(System.getenv()) }
1717

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

2020
group = "xyz.theprogramsrc"
2121
version = projectVersion
@@ -40,6 +40,14 @@ dependencies {
4040
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
4141
}
4242

43+
blossom {
44+
replaceToken("@name@", rootProject.name)
45+
replaceToken("@version@", project.version.toString())
46+
replaceToken("@description@", project.description)
47+
replaceToken("@git_short@", env["GIT_COMMIT_SHORT_HASH"] ?: "unknown")
48+
replaceToken("@git_full@", env["GIT_COMMIT_LONG_HASH"] ?: "unknown")
49+
}
50+
4351

4452
tasks {
4553
named<ShadowJar>("shadowJar") {
@@ -49,6 +57,7 @@ tasks {
4957
mergeServiceFiles()
5058
exclude("**/*.kotlin_metadata")
5159
exclude("**/*.kotlin_builtins")
60+
exclude("kotlin/**")
5261

5362
archiveBaseName.set("FilesModule")
5463
archiveClassifier.set("")

0 commit comments

Comments
 (0)