From cb88826e0a996a6402acbcc4eaa5d2b8139dfcd9 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sat, 8 Apr 2023 22:33:05 +0200 Subject: [PATCH] Updated JGit and Compose dependencies --- build.gradle.kts | 4 +-- .../gitnuro/extensions/ModifierExtensions.kt | 2 +- .../CloneRepositoryUseCase.kt | 2 ++ .../FetchAllBranchesUseCase.kt | 2 ++ .../remote_operations/PushBranchUseCase.kt | 1 + .../git/submodules/UpdateSubmoduleUseCase.kt | 30 +++++-------------- 6 files changed, 15 insertions(+), 26 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6fd8fbc..23722de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { kotlin("jvm") version "1.7.10" kotlin("kapt") version "1.7.10" kotlin("plugin.serialization") version "1.7.10" - id("org.jetbrains.compose") version "1.3.1" + id("org.jetbrains.compose") version "1.4.0-rc03" } // Remember to update Constants.APP_VERSION when changing this version @@ -26,7 +26,7 @@ repositories { } dependencies { - val jgit = "6.4.0.202211300538-r" + val jgit = "6.5.0.202303070854-r" implementation(compose.desktop.currentOs) @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt index 5732499..36a6b64 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt @@ -49,7 +49,7 @@ fun Modifier.ignoreKeyEvents(): Modifier { @OptIn(ExperimentalComposeUiApi::class) fun Modifier.handOnHover(): Modifier { - return this.pointerHoverIcon(PointerIconDefaults.Hand) + return this.pointerHoverIcon(PointerIcon.Hand) } // TODO Try to restore hover that was shown with clickable modifier diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt index 2ec508b..0cfd950 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt @@ -56,6 +56,8 @@ class CloneRepositoryUseCase @Inject constructor( override fun isCancelled(): Boolean { return !isActive } + + override fun showDuration(enabled: Boolean) {} } ) .setTransportConfigCallback { handleTransportUseCase(it, null) } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt index d70830a..662d82b 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt @@ -39,6 +39,8 @@ class FetchAllBranchesUseCase @Inject constructor( override fun endTask() {} override fun isCancelled(): Boolean = isActive + + override fun showDuration(enabled: Boolean) {} }) .call() } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt index 5696a65..ca92852 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt @@ -31,6 +31,7 @@ class PushBranchUseCase @Inject constructor( override fun update(completed: Int) {} override fun endTask() {} override fun isCancelled() = !isActive + override fun showDuration(enabled: Boolean) {} }) .call() diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt index 53833d5..08c4925 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/submodules/UpdateSubmoduleUseCase.kt @@ -1,7 +1,7 @@ package com.jetpackduba.gitnuro.git.submodules -import com.jetpackduba.gitnuro.logging.printLog import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.isActive import kotlinx.coroutines.withContext import org.eclipse.jgit.api.CloneCommand import org.eclipse.jgit.api.Git @@ -28,31 +28,15 @@ class UpdateSubmoduleUseCase @Inject constructor() { override fun checkingOut(commit: AnyObjectId?, path: String?) { } - } ) .setProgressMonitor(object : ProgressMonitor { - override fun start(totalTasks: Int) { - printLog(TAG, "start $totalTasks") - } - - override fun beginTask(title: String?, totalWork: Int) { - printLog(TAG, "being task $title $totalWork") - } - - override fun update(completed: Int) { - printLog(TAG, "Completed $completed") - } - - override fun endTask() { - printLog(TAG, "endtask") - } - - override fun isCancelled(): Boolean { - printLog(TAG, "isCancelled") - return false - } - + override fun start(totalTasks: Int) {} + override fun beginTask(title: String?, totalWork: Int) {} + override fun update(completed: Int) {} + override fun endTask() {} + override fun isCancelled(): Boolean = !isActive + override fun showDuration(enabled: Boolean) {} }) .call() }