Skip to content

Commit 17994fe

Browse files
devkanrodevkanro
committed
Upgrade sisyphus to 2.1.0
1 parent 2911463 commit 17994fe

File tree

9 files changed

+230
-158
lines changed

9 files changed

+230
-158
lines changed

‎.github/workflows/build.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ jobs:
66
name: Gradle Wrapper
77
runs-on: ubuntu-latest
88
steps:
9-
- name: Cancel Previous Runs
10-
uses: styfle/[email protected]
11-
with:
12-
access_token: ${{ secrets.GITHUB_TOKEN }}
13-
149
# Check out current repository
1510
- name: Fetch Sources
1611
uses: actions/checkout@v2
@@ -110,7 +105,7 @@ jobs:
110105
path: |
111106
./desktop/build/compose/binaries/main/msi/
112107
./desktop/build/compose/binaries/main/deb/
113-
./desktop/build/compose/notarization/main/*/*.dmg
108+
./desktop/build/compose/notarization/**/*.dmg
114109
115110
# Prepare a draft release for GitHub Releases page for the manual verification
116111
# If accepted and published, release workflow would be triggered

‎build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
2-
kotlin("jvm") version "1.6.10" apply false
3-
id("org.jetbrains.compose") version "1.1.1" apply false
4-
id("com.bybutter.sisyphus.protobuf") version "1.3.21" apply false
2+
kotlin("jvm") version "1.9.10" apply false
3+
id("org.jetbrains.compose") version "1.5.2" apply false
4+
id("com.bybutter.sisyphus.protobuf") version "2.1.0" apply false
55
id("org.jlleitschuh.gradle.ktlint") version "10.0.0" apply false
66
id("org.jetbrains.changelog") version "1.3.0"
77
}
88

99
allprojects {
1010
group = "io.kanro"
11-
version = "1.4.7"
11+
version = "1.5.0"
1212

1313
repositories {
1414
mavenLocal()

‎core/build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ protobuf {
1111
}
1212

1313
dependencies {
14-
api("io.grpc:grpc-core:1.42.1")
15-
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0")
16-
api("com.bybutter.sisyphus:sisyphus-grpc-coroutine:1.3.35")
17-
api("com.bybutter.sisyphus:sisyphus-jackson-protobuf:1.3.35")
18-
api("io.grpc:grpc-netty:1.42.1")
14+
api("io.grpc:grpc-core:1.59.0")
15+
api("io.grpc:grpc-netty:1.59.0")
16+
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3")
17+
api("com.bybutter.sisyphus:sisyphus-grpc-coroutine:2.1.0")
18+
api("com.bybutter.sisyphus:sisyphus-jackson-protobuf:2.1.0")
1919
api("io.netty:netty-handler-proxy:4.1.72.Final")
2020
api("org.bouncycastle:bcpkix-jdk15on:1.70")
2121

@@ -29,7 +29,7 @@ tasks.test {
2929
}
3030

3131
tasks.withType<KotlinCompile>() {
32-
kotlinOptions.jvmTarget = "16"
32+
kotlinOptions.jvmTarget = "17"
3333
}
3434

3535
ktlint {

‎desktop/build.gradle.kts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.jetbrains.compose.compose
21
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43

@@ -17,30 +16,31 @@ repositories {
1716

1817
dependencies {
1918
implementation(project(":core"))
20-
implementation("com.bybutter.compose:compose-jetbrains-theme:1.1.0")
19+
implementation("com.bybutter.compose:compose-jetbrains-theme:2.2.0")
2120
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
22-
testImplementation(kotlin("test-junit5"))
23-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
24-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
2521
implementation("net.harawata:appdirs:1.2.1")
2622
implementation("com.github.java-json-tools:json-patch:1.13")
2723
implementation("com.github.Dansoftowner:jSystemThemeDetector:3.8")
28-
implementation("com.bybutter.sisyphus.tools:sisyphus-protoc-runner:1.3.35")
24+
implementation("com.bybutter.sisyphus.tools:sisyphus-protoc-runner:2.1.0")
2925
implementation("ch.qos.logback:logback-classic:1.4.1")
3026

3127
implementation(compose.desktop.currentOs)
3228
implementation(compose.uiTooling)
29+
30+
testImplementation(kotlin("test-junit5"))
31+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
32+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
3333
}
3434

3535
tasks.test {
3636
useJUnitPlatform()
3737
}
3838

3939
tasks.withType<KotlinCompile>() {
40-
kotlinOptions.jvmTarget = "16"
40+
kotlinOptions.jvmTarget = "17"
4141
kotlinOptions.freeCompilerArgs += listOf(
4242
"-P",
43-
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
43+
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
4444
)
4545
}
4646

@@ -49,7 +49,7 @@ compose.desktop {
4949
mainClass = "io.kanro.mediator.desktop.MainKt"
5050
nativeDistributions {
5151
jvmArgs(
52-
"-Dapple.awt.application.appearance=system"
52+
"-Dapple.awt.application.appearance=system",
5353
)
5454
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
5555
modules("java.management")

‎desktop/src/main/kotlin/io/kanro/mediator/desktop/ui/CallList.kt

+17-12
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ import com.bybutter.sisyphus.protobuf.primitives.minus
4242
import com.bybutter.sisyphus.protobuf.primitives.toTime
4343
import io.grpc.Status
4444
import io.kanro.compose.jetbrains.JBTheme
45-
import io.kanro.compose.jetbrains.SelectionScope
4645
import io.kanro.compose.jetbrains.control.Icon
4746
import io.kanro.compose.jetbrains.control.JPanelBorder
4847
import io.kanro.compose.jetbrains.control.ListItemHoverIndication
48+
import io.kanro.compose.jetbrains.control.SelectionScope
4949
import io.kanro.compose.jetbrains.control.Text
5050
import io.kanro.compose.jetbrains.control.jBorder
5151
import io.kanro.mediator.desktop.model.CallEvent
@@ -111,7 +111,7 @@ fun CallList(modifier: Modifier = Modifier) {
111111

112112
VerticalScrollbar(
113113
rememberScrollbarAdapter(listState),
114-
Modifier.align(Alignment.CenterEnd)
114+
Modifier.align(Alignment.CenterEnd),
115115
)
116116
}
117117
}
@@ -134,7 +134,7 @@ fun CallRowHeader(
134134
.fillMaxWidth()
135135
.background(JBTheme.panelColors.bgContent)
136136
.jBorder(bottom = 1.dp, color = JBTheme.panelColors.border),
137-
verticalAlignment = Alignment.CenterVertically
137+
verticalAlignment = Alignment.CenterVertically,
138138
) {
139139
val idState = rememberDraggableState { delta ->
140140
resizing(0, delta)
@@ -150,7 +150,7 @@ fun CallRowHeader(
150150
return pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR)))
151151
.draggable(
152152
orientation = Orientation.Horizontal,
153-
state = state
153+
state = state,
154154
)
155155
}
156156

@@ -183,7 +183,7 @@ fun CallRow(
183183
selected: Boolean,
184184
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
185185
role: Role? = null,
186-
onClick: () -> Unit
186+
onClick: () -> Unit,
187187
) {
188188
SelectionScope(selected) {
189189
Row(
@@ -202,7 +202,7 @@ fun CallRow(
202202
interactionSource = interactionSource,
203203
indication = ListItemHoverIndication,
204204
onClick = onClick,
205-
role = role
205+
role = role,
206206
)
207207
.run {
208208
if (selected) {
@@ -213,7 +213,7 @@ fun CallRow(
213213
}
214214
.hoverable(interactionSource)
215215
.jBorder(bottom = 1.dp, color = JBTheme.panelColors.border),
216-
verticalAlignment = Alignment.CenterVertically
216+
verticalAlignment = Alignment.CenterVertically,
217217
) {
218218
val call by record.asState()
219219
val start = call.start()
@@ -296,25 +296,30 @@ fun CallIcon(call: CallTimeline, modifier: Modifier = Modifier) {
296296
Status.Code.OK -> Icon("icons/toolbarPassed.svg")
297297

298298
Status.Code.ABORTED,
299-
Status.Code.CANCELLED -> Icon("icons/toolbarTerminated.svg")
299+
Status.Code.CANCELLED,
300+
-> Icon("icons/toolbarTerminated.svg")
300301

301302
Status.Code.DEADLINE_EXCEEDED,
302303
Status.Code.PERMISSION_DENIED,
303-
Status.Code.UNAUTHENTICATED -> Icon("icons/toolbarSkipped.svg")
304+
Status.Code.UNAUTHENTICATED,
305+
-> Icon("icons/toolbarSkipped.svg")
304306

305307
Status.Code.ALREADY_EXISTS,
306308
Status.Code.RESOURCE_EXHAUSTED,
307309
Status.Code.FAILED_PRECONDITION,
308310
Status.Code.OUT_OF_RANGE,
309311
Status.Code.UNAVAILABLE,
310-
Status.Code.INVALID_ARGUMENT -> Icon("icons/toolbarFailed.svg")
312+
Status.Code.INVALID_ARGUMENT,
313+
-> Icon("icons/toolbarFailed.svg")
311314

312315
Status.Code.DATA_LOSS,
313-
Status.Code.NOT_FOUND -> Icon("icons/testUnknown.svg")
316+
Status.Code.NOT_FOUND,
317+
-> Icon("icons/testUnknown.svg")
314318

315319
Status.Code.UNIMPLEMENTED,
316320
Status.Code.UNKNOWN,
317-
Status.Code.INTERNAL -> Icon("icons/toolbarError.svg")
321+
Status.Code.INTERNAL,
322+
-> Icon("icons/toolbarError.svg")
318323

319324
else -> Icon("icons/run.svg")
320325
}

0 commit comments

Comments
 (0)