Skip to content

Commit a2552d5

Browse files
committed
fix circular dependency in tusow-full
1 parent b8035ff commit a2552d5

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

build.gradle.kts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,19 @@ if (gitHubToken?.isNotBlank() ?: false) {
182182
releaseAssets(*jarTasks.map { it.archiveFile }.toTypedArray())
183183
}
184184

185-
tasks.withType(GithubReleaseTask::class) {
186-
dependsOn(*jarTasks.toTypedArray())
187-
doFirst {
188-
configure<GithubReleaseExtension> {
189-
body("""|
185+
fun setUpChangelog() {
186+
configure<GithubReleaseExtension> {
187+
body("""|
190188
|## CHANGELOG
191189
|${changelog().call()}
192190
""".trimMargin())
193-
}
191+
}
192+
}
193+
194+
tasks.withType(GithubReleaseTask::class) {
195+
dependsOn(*jarTasks.toTypedArray())
196+
doFirst {
197+
setUpChangelog()
194198
}
195199
}
196200
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ bintrayUser=
1818
bintrayKey=
1919

2020
# GitHub token
21-
gitHubToken=f16413ca0d0fb3fabe6b966e7c920f3c2133d4e4
21+
gitHubToken=

tusow-full/build.gradle.kts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
val tusowFull = name
2+
13
dependencies {
2-
rootProject.subprojects.map { it.name }.forEach {
3-
api(project(":$it"))
4-
}
4+
rootProject.subprojects
5+
.map { it.name }
6+
.filter { it != tusowFull }
7+
.forEach {
8+
api(project(":$it"))
9+
}
510
}
611

712
tasks.getByName<Jar>("shadowJar") {

0 commit comments

Comments
 (0)