Skip to content

Commit f89d61c

Browse files
committed
Also make it work interactively
1 parent c77a3ec commit f89d61c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

librarian-cli/api/librarian-cli.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ public final class com/gradleup/librarian/cli/screen/PrepareNextVersionScreenKt
100100
}
101101

102102
public final class com/gradleup/librarian/cli/screen/SetVersionScreenKt {
103-
public static final fun SetVersionScreen (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V
103+
public static final fun SetVersionScreen (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;I)V
104104
}
105105

librarian-cli/src/main/kotlin/com/gradleup/librarian/cli/screen/SetVersionScreen.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ package com.gradleup.librarian.cli.screen
33
import androidx.compose.runtime.Composable
44
import androidx.compose.runtime.mutableStateOf
55
import androidx.compose.runtime.remember
6-
import com.gradleup.librarian.cli.command.dropSnapshot
6+
import com.gradleup.librarian.cli.command.VersionContext
77
import com.gradleup.librarian.cli.command.getCurrentVersion
8-
import com.gradleup.librarian.cli.command.getNextSnapshot
98
import com.gradleup.librarian.cli.command.setCurrentVersion
109
import com.gradleup.librarian.cli.component.Choice
1110
import com.gradleup.librarian.cli.component.ListInput
12-
import com.gradleup.librarian.core.tooling.SemVer
13-
import com.gradleup.librarian.core.tooling.bump
1411
import com.gradleup.librarian.core.tooling.nextMajor
1512
import com.gradleup.librarian.core.tooling.nextMinor
1613
import com.gradleup.librarian.core.tooling.nextPatch
@@ -21,6 +18,7 @@ import com.gradleup.librarian.core.tooling.semVerOrNull
2118
fun SetVersionScreen(
2219
onVersionSet: () -> Unit,
2320
onOtherVersion: () -> Unit,
21+
setVersion: VersionContext.() -> Unit,
2422
) {
2523
val indexState = remember { mutableStateOf(0) }
2624

@@ -53,6 +51,7 @@ fun SetVersionScreen(
5351
null -> onOtherVersion()
5452
else -> {
5553
setCurrentVersion(it.data.toString())
54+
VersionContext(it.data.toString()).setVersion()
5655
onVersionSet()
5756
}
5857
}

librarian-cli/src/main/kotlin/com/gradleup/librarian/cli/update-repo.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.jakewharton.mosaic.runMosaicBlocking
2121
import kotlinx.coroutines.CompletableDeferred
2222

2323

24-
private class MainCommand(val setVersionInDocs: VersionContext.() -> Unit) : CliktCommand(invokeWithoutSubcommand = true) {
24+
private class MainCommand(val setVersion: VersionContext.() -> Unit, val setVersionInDocs: VersionContext.() -> Unit) : CliktCommand(invokeWithoutSubcommand = true) {
2525
override fun run() {
2626
runMosaicBlocking {
2727
val exit = remember { CompletableDeferred<Unit>() }
@@ -38,6 +38,7 @@ private class MainCommand(val setVersionInDocs: VersionContext.() -> Unit) : Cli
3838
)
3939

4040
State.SetVersion -> SetVersionScreen(
41+
setVersion = setVersion,
4142
onVersionSet = { state.value = State.CommitChanges },
4243
onOtherVersion = { state.value = State.AskVersion }
4344
)
@@ -78,7 +79,7 @@ private enum class State {
7879
* @param setDocsVersion how to set the docs version. The docs version is lagging behind the repo version and is not a SNAPSHOT.
7980
*/
8081
fun updateRepo(args: Array<String>, setVersion: VersionContext.() -> Unit = {}, setDocsVersion: VersionContext.() -> Unit) {
81-
MainCommand(setDocsVersion).subcommands(SetVersion(setVersion), PrepareNextVersion(setDocsVersion)).main(args)
82+
MainCommand(setVersion, setDocsVersion).subcommands(SetVersion(setVersion), PrepareNextVersion(setDocsVersion)).main(args)
8283
}
8384

8485
fun main(args: Array<String>) {

0 commit comments

Comments
 (0)