Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Kotlin to 2.0.0 and Compose to 1.6.10

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2024-05-22 18:15:30 +02:00
parent 8f1f87feca
commit 0a324f1fe2
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle.kts
View File

@ -10,10 +10,11 @@ val linuxX64Target = "x86_64-unknown-linux-gnu"
plugins { plugins {
// Kotlin version must match compose version // Kotlin version must match compose version
kotlin("jvm") version "1.9.20" kotlin("jvm") version "2.0.0"
kotlin("plugin.serialization") version "1.9.20" kotlin("plugin.serialization") version "2.0.0"
id("com.google.devtools.ksp") version "1.9.20-1.0.14" id("com.google.devtools.ksp") version "2.0.0-1.0.21"
id("org.jetbrains.compose") version "1.6.1" id("org.jetbrains.compose") version "1.6.10"
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
} }
// Remember to update Constants.APP_VERSION when changing this version // Remember to update Constants.APP_VERSION when changing this version

4
src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
View File

@ -75,6 +75,7 @@ import java.io.FileInputStream
import kotlin.math.max import kotlin.math.max
private const val MAX_MOVES_COUNT = 5 private const val MAX_MOVES_COUNT = 5
@Composable @Composable
private fun <T> loadOrNull(key: Any, action: suspend () -> T?): T? { private fun <T> loadOrNull(key: Any, action: suspend () -> T?): T? {
var result: T? by remember(key) { mutableStateOf(null) } var result: T? by remember(key) { mutableStateOf(null) }
@ -805,8 +806,7 @@ fun HunkHeader(
// Hunks options are only visible when repository is a normal state (not during merge/rebase) // Hunks options are only visible when repository is a normal state (not during merge/rebase)
if ( if (
(diffEntryType is DiffEntryType.SafeStagedDiff || diffEntryType is DiffEntryType.SafeUnstagedDiff) && (diffEntryType is DiffEntryType.SafeStagedDiff || diffEntryType is DiffEntryType.SafeUnstagedDiff) &&
(diffEntryType is DiffEntryType.UncommittedDiff && // Added just to make smartcast work diffEntryType.statusType == StatusType.MODIFIED
diffEntryType.statusEntry.statusType == StatusType.MODIFIED)
) { ) {
val buttonText: String val buttonText: String
val color: Color val color: Color