Moved classes to match the package name

build.gradle.kts

@@ -87,7 +87,7 @@ task("fatJarLinux", type = Jar::class) {
     manifest {
         attributes["Implementation-Title"] = name
         attributes["Implementation-Version"] = projectVersion
-        attributes["Main-Class"] = "MainKt"
+        attributes["Main-Class"] = "com.jetpackduba.gitnuro.MainKt"
     }
     from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) {
         exclude(

src/main/kotlin/com/jetpackduba/gitnuro/App.kt

@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalComposeUiApi::class)
 
-package app
+package com.jetpackduba.gitnuro
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
@@ -23,20 +23,20 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
-import app.di.DaggerAppComponent
-import app.extensions.preferenceValue
-import app.extensions.toWindowPlacement
-import app.logging.printLog
-import app.preferences.AppSettings
-import app.theme.AppTheme
-import app.theme.Theme
-import app.theme.primaryTextColor
-import app.theme.secondaryTextColor
-import app.ui.AppTab
-import app.ui.components.RepositoriesTabPanel
-import app.ui.components.TabInformation
-import app.ui.dialogs.settings.SettingsDialog
-import app.viewmodels.SettingsViewModel
+import com.jetpackduba.gitnuro.di.DaggerAppComponent
+import com.jetpackduba.gitnuro.extensions.preferenceValue
+import com.jetpackduba.gitnuro.extensions.toWindowPlacement
+import com.jetpackduba.gitnuro.logging.printLog
+import com.jetpackduba.gitnuro.preferences.AppSettings
+import com.jetpackduba.gitnuro.theme.AppTheme
+import com.jetpackduba.gitnuro.theme.Theme
+import com.jetpackduba.gitnuro.theme.primaryTextColor
+import com.jetpackduba.gitnuro.theme.secondaryTextColor
+import com.jetpackduba.gitnuro.ui.AppTab
+import com.jetpackduba.gitnuro.ui.components.RepositoriesTabPanel
+import com.jetpackduba.gitnuro.ui.components.TabInformation
+import com.jetpackduba.gitnuro.ui.dialogs.settings.SettingsDialog
+import com.jetpackduba.gitnuro.viewmodels.SettingsViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch

src/main/kotlin/com/jetpackduba/gitnuro/AppConstants.kt

@@ -1,4 +1,4 @@
-package app
+package com.jetpackduba.gitnuro
 
 object AppConstants {
     val openSourceProjects = listOf(

src/main/kotlin/com/jetpackduba/gitnuro/AppStateManager.kt

@@ -1,6 +1,6 @@
-package app
+package com.jetpackduba.gitnuro
 
-import app.preferences.AppSettings
+import com.jetpackduba.gitnuro.preferences.AppSettings
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.serialization.decodeFromString
@@ -85,6 +85,6 @@ class AppStateManager @Inject constructor(
     }
 
     fun cancelCoroutines() {
-        appStateScope.cancel("Closing app")
+        appStateScope.cancel("Closing com.jetpackduba.gitnuro.app")
     }
 }

src/main/kotlin/com/jetpackduba/gitnuro/ErrorsManager.kt

@@ -1,6 +1,6 @@
-package app
+package com.jetpackduba.gitnuro
 
-import app.di.TabScope
+import com.jetpackduba.gitnuro.di.TabScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow

src/main/kotlin/com/jetpackduba/gitnuro/TempFilesManager.kt

@@ -1,6 +1,6 @@
-package app
+package com.jetpackduba.gitnuro
 
-import app.di.TabScope
+import com.jetpackduba.gitnuro.di.TabScope
 import javax.inject.Inject
 import kotlin.io.path.createTempDirectory
 import kotlin.io.path.deleteIfExists

src/main/kotlin/com/jetpackduba/gitnuro/credentials/CredentialsStateManager.kt

@@ -1,4 +1,4 @@
-package app.credentials
+package com.jetpackduba.gitnuro.credentials
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

src/main/kotlin/com/jetpackduba/gitnuro/credentials/GProcess.kt

@@ -1,4 +1,4 @@
-package app.credentials
+package com.jetpackduba.gitnuro.credentials
 
 import org.apache.sshd.client.channel.ChannelExec
 import org.apache.sshd.client.session.ClientSession

src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt

@@ -1,4 +1,4 @@
-package app.credentials
+package com.jetpackduba.gitnuro.credentials
 
 import org.apache.sshd.client.SshClient
 import org.apache.sshd.client.future.ConnectFuture
@@ -63,11 +63,11 @@ class GRemoteSession @Inject constructor(
 
         val filePasswordProvider =
             FilePasswordProvider { _, _, _ ->
-                credentialsStateManager.updateState(CredentialsState.SshCredentialsRequested)
+                CredentialsStateManager.updateState(CredentialsState.SshCredentialsRequested)
 
-                var credentials = credentialsStateManager.currentCredentialsState
+                var credentials = CredentialsStateManager.currentCredentialsState
                 while (credentials is CredentialsState.CredentialsRequested) {
-                    credentials = credentialsStateManager.currentCredentialsState
+                    credentials = CredentialsStateManager.currentCredentialsState
                 }
 
                 if (credentials !is CredentialsState.SshCredentialsAccepted)

src/main/kotlin/com/jetpackduba/gitnuro/credentials/GSessionManager.kt

@@ -1,4 +1,4 @@
-package app.credentials
+package com.jetpackduba.gitnuro.credentials
 
 import org.eclipse.jgit.transport.CredentialsProvider
 import org.eclipse.jgit.transport.RemoteSession

src/main/kotlin/com/jetpackduba/gitnuro/credentials/HttpCredentialsProvider.kt

@@ -1,4 +1,4 @@
-package app.credentials
+package com.jetpackduba.gitnuro.credentials
 
 import org.eclipse.jgit.transport.CredentialItem
 import org.eclipse.jgit.transport.CredentialsProvider
@@ -23,11 +23,11 @@ class HttpCredentialsProvider : CredentialsProvider() {
     }
 
     override fun get(uri: URIish?, vararg items: CredentialItem?): Boolean {
-        credentialsStateManager.updateState(CredentialsState.HttpCredentialsRequested)
+        CredentialsStateManager.updateState(CredentialsState.HttpCredentialsRequested)
 
-        var credentials = credentialsStateManager.currentCredentialsState
+        var credentials = CredentialsStateManager.currentCredentialsState
         while (credentials is CredentialsState.CredentialsRequested) {
-            credentials = credentialsStateManager.currentCredentialsState
+            credentials = CredentialsStateManager.currentCredentialsState
         }
 
         if (credentials is CredentialsState.HttpCredentialsAccepted) {

src/main/kotlin/com/jetpackduba/gitnuro/di/AppComponent.kt

@@ -1,8 +1,8 @@
-package app.di
+package com.jetpackduba.gitnuro.di
 
-import app.App
-import app.AppStateManager
-import app.preferences.AppSettings
+import com.jetpackduba.gitnuro.App
+import com.jetpackduba.gitnuro.AppStateManager
+import com.jetpackduba.gitnuro.preferences.AppSettings
 import dagger.Component
 import javax.inject.Singleton
 

src/main/kotlin/com/jetpackduba/gitnuro/di/TabComponent.kt

@@ -1,7 +1,7 @@
-package app.di
+package com.jetpackduba.gitnuro.di
 
-import app.di.modules.NetworkModule
-import app.ui.components.TabInformation
+import com.jetpackduba.gitnuro.di.modules.NetworkModule
+import com.jetpackduba.gitnuro.ui.components.TabInformation
 import dagger.Component
 
 @TabScope

src/main/kotlin/com/jetpackduba/gitnuro/di/TabScope.kt

@@ -1,4 +1,4 @@
-package app.di
+package com.jetpackduba.gitnuro.di
 
 import javax.inject.Scope
 

src/main/kotlin/com/jetpackduba/gitnuro/di/modules/NetworkModule.kt

@@ -1,6 +1,6 @@
-package app.di.modules
+package com.jetpackduba.gitnuro.di.modules
 
-import app.updates.UpdatesService
+import com.jetpackduba.gitnuro.updates.UpdatesService
 import dagger.Provides
 import retrofit2.Retrofit
 import retrofit2.converter.scalars.ScalarsConverterFactory

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/GitnuroException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 abstract class GitnuroException(msg: String) : RuntimeException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidDirectoryException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 class InvalidDirectoryException(msg: String) : GitnuroException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidMessageException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 class InvalidMessageException(msg: String) : GitnuroException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/InvalidRemoteUrlException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 class InvalidRemoteUrlException(msg: String) : GitnuroException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/MissingDiffEntryException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 class MissingDiffEntryException(msg: String) : GitnuroException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/RebaseCancelledException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 class RebaseCancelledException(msg: String) : GitnuroException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/exceptions/UncommitedChangesDetectedException.kt

@@ -1,3 +1,3 @@
-package app.exceptions
+package com.jetpackduba.gitnuro.exceptions
 
 class UncommitedChangesDetectedException(msg: String) : GitnuroException(msg)

src/main/kotlin/com/jetpackduba/gitnuro/extensions/DateExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import java.text.DateFormat
 import java.time.LocalDate

src/main/kotlin/com/jetpackduba/gitnuro/extensions/DiffEntryExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
@@ -6,11 +6,11 @@ import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import app.git.workspace.StatusEntry
-import app.git.workspace.StatusType
-import app.theme.addFile
-import app.theme.conflictFile
-import app.theme.modifyFile
+import com.jetpackduba.gitnuro.git.workspace.StatusEntry
+import com.jetpackduba.gitnuro.git.workspace.StatusType
+import com.jetpackduba.gitnuro.theme.addFile
+import com.jetpackduba.gitnuro.theme.conflictFile
+import com.jetpackduba.gitnuro.theme.modifyFile
 import org.eclipse.jgit.diff.DiffEntry
 
 val DiffEntry.parentDirectoryPath: String

src/main/kotlin/com/jetpackduba/gitnuro/extensions/InputStreamExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import java.io.ByteArrayOutputStream
 import java.io.InputStream

src/main/kotlin/com/jetpackduba/gitnuro/extensions/IntExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 fun Int.toStringWithSpaces(charactersCount: Int): String {
     val numberStr = this.toString()

src/main/kotlin/com/jetpackduba/gitnuro/extensions/LazyListStateExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import androidx.compose.foundation.lazy.LazyListState
 

src/main/kotlin/com/jetpackduba/gitnuro/extensions/ListExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 fun <T> List<T>?.countOrZero(): Int {
     return this?.count() ?: 0

src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

src/main/kotlin/com/jetpackduba/gitnuro/extensions/RawTextExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import org.eclipse.jgit.diff.RawText
 import java.io.ByteArrayOutputStream

src/main/kotlin/com/jetpackduba/gitnuro/extensions/RefExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.ObjectIdRef

src/main/kotlin/com/jetpackduba/gitnuro/extensions/RepositoryStateExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import org.eclipse.jgit.lib.RepositoryState
 

src/main/kotlin/com/jetpackduba/gitnuro/extensions/RevCommitExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import org.eclipse.jgit.lib.Repository
 import org.eclipse.jgit.revwalk.RevCommit

src/main/kotlin/com/jetpackduba/gitnuro/extensions/SemaphoreExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import androidx.compose.runtime.Composable
 import kotlinx.coroutines.sync.Semaphore

src/main/kotlin/com/jetpackduba/gitnuro/extensions/Shell.kt

@@ -1,6 +1,6 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
-import app.logging.printLog
+import com.jetpackduba.gitnuro.logging.printLog
 import java.io.IOException
 import java.util.*
 

src/main/kotlin/com/jetpackduba/gitnuro/extensions/StateManagementUtils.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import kotlinx.coroutines.*
 

src/main/kotlin/com/jetpackduba/gitnuro/extensions/StatusExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import org.eclipse.jgit.api.Status
 

src/main/kotlin/com/jetpackduba/gitnuro/extensions/StringExtensions.kt

@@ -1,4 +1,4 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import java.math.BigInteger
 import java.security.MessageDigest

src/main/kotlin/com/jetpackduba/gitnuro/extensions/SystemUtils.kt

@@ -1,6 +1,6 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
-import app.logging.printLog
+import com.jetpackduba.gitnuro.logging.printLog
 import java.awt.Desktop
 import java.awt.Toolkit
 import java.awt.datatransfer.Clipboard

src/main/kotlin/com/jetpackduba/gitnuro/extensions/WindowPlacement.kt

@@ -1,7 +1,7 @@
-package app.extensions
+package com.jetpackduba.gitnuro.extensions
 
 import androidx.compose.ui.window.WindowPlacement
-import app.preferences.WindowsPlacementPreference
+import com.jetpackduba.gitnuro.preferences.WindowsPlacementPreference
 
 
 private val windowPlacementFloating = WindowsPlacementPreference(0)

src/main/kotlin/com/jetpackduba/gitnuro/git/CloneStatus.kt

@@ -1,4 +1,4 @@
-package app.git
+package com.jetpackduba.gitnuro.git
 
 import org.eclipse.jgit.transport.RemoteRefUpdate
 import java.io.File

src/main/kotlin/com/jetpackduba/gitnuro/git/DiffEntryType.kt

@@ -1,9 +1,9 @@
-package app.git
+package com.jetpackduba.gitnuro.git
 
-import app.extensions.filePath
-import app.extensions.toStatusType
-import app.git.workspace.StatusEntry
-import app.git.workspace.StatusType
+import com.jetpackduba.gitnuro.extensions.filePath
+import com.jetpackduba.gitnuro.extensions.toStatusType
+import com.jetpackduba.gitnuro.git.workspace.StatusEntry
+import com.jetpackduba.gitnuro.git.workspace.StatusType
 import org.eclipse.jgit.diff.DiffEntry
 
 sealed class DiffEntryType {

src/main/kotlin/com/jetpackduba/gitnuro/git/FileChangesWatcher.kt

@@ -1,7 +1,7 @@
-package app.git
+package com.jetpackduba.gitnuro.git
 
-import app.extensions.systemSeparator
-import app.logging.printLog
+import com.jetpackduba.gitnuro.extensions.systemSeparator
+import com.jetpackduba.gitnuro.logging.printLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -100,7 +100,7 @@ class FileChangesWatcher @Inject constructor() {
     }
 
     private fun isGitMessageFile(repoPath: String, fullPathOfFileChanged: String): Boolean {
-        val gitDir = "$repoPath$systemSeparator.git${systemSeparator}"
+        val gitDir = "$repoPath$systemSeparator.git$systemSeparator"
         return fullPathOfFileChanged == "${gitDir}COMMIT_EDITMSG" ||
                 fullPathOfFileChanged == "${gitDir}MERGE_MSG"
     }

src/main/kotlin/com/jetpackduba/gitnuro/git/RawFileManager.kt

@@ -1,7 +1,7 @@
-package app.git
+package com.jetpackduba.gitnuro.git
 
-import app.TempFilesManager
-import app.extensions.systemSeparator
+import com.jetpackduba.gitnuro.TempFilesManager
+import com.jetpackduba.gitnuro.extensions.systemSeparator
 import org.eclipse.jgit.diff.ContentSource
 import org.eclipse.jgit.diff.DiffEntry
 import org.eclipse.jgit.diff.RawText

src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt

@@ -1,10 +1,10 @@
-package app.git
+package com.jetpackduba.gitnuro.git
 
-import app.ErrorsManager
-import app.di.TabScope
-import app.extensions.delayedStateChange
-import app.newErrorNow
-import app.ui.SelectedItem
+import com.jetpackduba.gitnuro.ErrorsManager
+import com.jetpackduba.gitnuro.di.TabScope
+import com.jetpackduba.gitnuro.extensions.delayedStateChange
+import com.jetpackduba.gitnuro.newErrorNow
+import com.jetpackduba.gitnuro.ui.SelectedItem
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/TaskEvent.kt

@@ -1,4 +1,4 @@
-package app.git
+package com.jetpackduba.gitnuro.git
 
 import org.eclipse.jgit.revwalk.RevCommit
 

src/main/kotlin/com/jetpackduba/gitnuro/git/author/LoadAuthorUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.author
+package com.jetpackduba.gitnuro.git.author
 
-import app.models.AuthorInfo
+import com.jetpackduba.gitnuro.models.AuthorInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/author/SaveAuthorUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.author
+package com.jetpackduba.gitnuro.git.author
 
-import app.models.AuthorInfo
+import com.jetpackduba.gitnuro.models.AuthorInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CheckoutRefUseCase.kt

@@ -1,7 +1,7 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
-import app.extensions.isBranch
-import app.extensions.simpleName
+import com.jetpackduba.gitnuro.extensions.isBranch
+import com.jetpackduba.gitnuro.extensions.simpleName
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.CreateBranchCommand

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchOnCommitUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/CreateBranchUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteBranchUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/DeleteLocallyRemoteBranchesUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetBranchesUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetCurrentBranchUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.Ref

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/GetRemoteBranchesUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/branches/MergeBranchUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.branches
+package com.jetpackduba.gitnuro.git.branches
 
-import app.exceptions.UncommitedChangesDetectedException
+import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/diff/FormatDiffUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.diff
+package com.jetpackduba.gitnuro.git.diff
 
-import app.git.DiffEntryType
+import com.jetpackduba.gitnuro.git.DiffEntryType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GenerateSplitHunkFromDiffResultUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.diff
+package com.jetpackduba.gitnuro.git.diff
 
 import javax.inject.Inject
 import kotlin.math.abs

src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetCommitDiffEntriesUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.diff
+package com.jetpackduba.gitnuro.git.diff
 
-import app.extensions.fullData
+import com.jetpackduba.gitnuro.extensions.fullData
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/diff/GetDiffEntryForUncommitedDiffUseCase.kt

@@ -1,10 +1,10 @@
-package app.git.diff
+package com.jetpackduba.gitnuro.git.diff
 
-import app.exceptions.MissingDiffEntryException
-import app.extensions.isMerging
-import app.git.DiffEntryType
-import app.git.branches.GetCurrentBranchUseCase
-import app.git.repository.GetRepositoryStateUseCase
+import com.jetpackduba.gitnuro.exceptions.MissingDiffEntryException
+import com.jetpackduba.gitnuro.extensions.isMerging
+import com.jetpackduba.gitnuro.git.DiffEntryType
+import com.jetpackduba.gitnuro.git.branches.GetCurrentBranchUseCase
+import com.jetpackduba.gitnuro.git.repository.GetRepositoryStateUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/diff/Hunk.kt

@@ -1,4 +1,4 @@
-package app.git.diff
+package com.jetpackduba.gitnuro.git.diff
 
 data class Hunk(val header: String, val lines: List<Line>)
 

src/main/kotlin/com/jetpackduba/gitnuro/git/diff/HunkDiffGenerator.kt

@@ -1,8 +1,8 @@
-package app.git.diff
+package com.jetpackduba.gitnuro.git.diff
 
-import app.extensions.lineAt
-import app.git.EntryContent
-import app.git.RawFileManager
+import com.jetpackduba.gitnuro.extensions.lineAt
+import com.jetpackduba.gitnuro.git.EntryContent
+import com.jetpackduba.gitnuro.git.RawFileManager
 import org.eclipse.jgit.diff.*
 import org.eclipse.jgit.lib.Repository
 import org.eclipse.jgit.patch.FileHeader

src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphCommitList.kt

@@ -1,4 +1,4 @@
-package app.git.graph
+package com.jetpackduba.gitnuro.git.graph
 
 import org.eclipse.jgit.internal.JGitText
 import org.eclipse.jgit.lib.AnyObjectId

src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphLane.kt

@@ -1,4 +1,4 @@
-package app.git.graph
+package com.jetpackduba.gitnuro.git.graph
 
 const val INVALID_LANE_POSITION = -1
 

src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphNode.kt

@@ -1,4 +1,4 @@
-package app.git.graph
+package com.jetpackduba.gitnuro.git.graph
 
 import org.eclipse.jgit.lib.AnyObjectId
 import org.eclipse.jgit.lib.Ref

src/main/kotlin/com/jetpackduba/gitnuro/git/graph/GraphWalk.kt

@@ -1,4 +1,4 @@
-package app.git.graph
+package com.jetpackduba.gitnuro.git.graph
 
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.internal.JGitText

src/main/kotlin/com/jetpackduba/gitnuro/git/graph/IGraphNode.kt

@@ -1,4 +1,4 @@
-package app.git.graph
+package com.jetpackduba.gitnuro.git.graph
 
 interface IGraphNode {
     val graphParentCount: Int

src/main/kotlin/com/jetpackduba/gitnuro/git/graph/UncommitedChangesGraphNode.kt

@@ -1,4 +1,4 @@
-package app.git.graph
+package com.jetpackduba.gitnuro.git.graph
 
 import org.eclipse.jgit.lib.ObjectId
 

src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckHasPreviousCommitsUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/log/CheckoutCommitUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/log/CherryPickCommitUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLastCommitMessageUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/log/GetLogUseCase.kt

@@ -1,8 +1,8 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 
-import app.git.graph.GraphCommitList
-import app.git.graph.GraphWalk
+import com.jetpackduba.gitnuro.git.graph.GraphCommitList
+import com.jetpackduba.gitnuro.git.graph.GraphWalk
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/log/ResetToCommitUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/log/RevertCommitUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.log
+package com.jetpackduba.gitnuro.git.log
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/AbortRebaseUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ContinueRebaseUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/GetRebaseLinesFullMessageUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/RebaseBranchUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
-import app.exceptions.UncommitedChangesDetectedException
+import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/ResumeRebaseInteractiveUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
-import app.exceptions.UncommitedChangesDetectedException
+import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/SkipRebaseUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/rebase/StartRebaseInteractiveUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.rebase
+package com.jetpackduba.gitnuro.git.rebase
 
-import app.exceptions.UncommitedChangesDetectedException
+import com.jetpackduba.gitnuro.exceptions.UncommitedChangesDetectedException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/CloneRepositoryUseCase.kt

@@ -1,6 +1,6 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
-import app.git.CloneStatus
+import com.jetpackduba.gitnuro.git.CloneStatus
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/DeleteRemoteBranchUseCase.kt

@@ -1,8 +1,8 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
-import app.git.branches.DeleteBranchUseCase
-import app.git.isRejected
-import app.git.statusMessage
+import com.jetpackduba.gitnuro.git.branches.DeleteBranchUseCase
+import com.jetpackduba.gitnuro.git.isRejected
+import com.jetpackduba.gitnuro.git.statusMessage
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.Ref
 import org.eclipse.jgit.transport.RefSpec

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/FetchAllBranchesUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/HandleTransportUseCase.kt

@@ -1,7 +1,7 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
-import app.credentials.GSessionManager
-import app.credentials.HttpCredentialsProvider
+import com.jetpackduba.gitnuro.credentials.GSessionManager
+import com.jetpackduba.gitnuro.credentials.HttpCredentialsProvider
 import org.eclipse.jgit.transport.HttpTransport
 import org.eclipse.jgit.transport.SshTransport
 import org.eclipse.jgit.transport.Transport

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullBranchUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PullFromSpecificBranchUseCase.kt

@@ -1,7 +1,7 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
-import app.extensions.remoteName
-import app.extensions.simpleName
+import com.jetpackduba.gitnuro.extensions.remoteName
+import com.jetpackduba.gitnuro.extensions.simpleName
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushBranchUseCase.kt

@@ -1,7 +1,7 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
-import app.git.isRejected
-import app.git.statusMessage
+import com.jetpackduba.gitnuro.git.isRejected
+import com.jetpackduba.gitnuro.git.statusMessage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/remote_operations/PushToSpecificBranchUseCase.kt

@@ -1,9 +1,9 @@
-package app.git.remote_operations
+package com.jetpackduba.gitnuro.git.remote_operations
 
-import app.extensions.remoteName
-import app.extensions.simpleName
-import app.git.isRejected
-import app.git.statusMessage
+import com.jetpackduba.gitnuro.extensions.remoteName
+import com.jetpackduba.gitnuro.extensions.simpleName
+import com.jetpackduba.gitnuro.git.isRejected
+import com.jetpackduba.gitnuro.git.statusMessage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.api.Git

src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/AddRemoteUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.remotes
+package com.jetpackduba.gitnuro.git.remotes
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/DeleteRemoteUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.remotes
+package com.jetpackduba.gitnuro.git.remotes
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/GetRemotesUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.remotes
+package com.jetpackduba.gitnuro.git.remotes
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/RemoteInfo.kt

@@ -1,4 +1,4 @@
-package app.git.remotes
+package com.jetpackduba.gitnuro.git.remotes
 
 import org.eclipse.jgit.lib.Ref
 import org.eclipse.jgit.transport.RemoteConfig

src/main/kotlin/com/jetpackduba/gitnuro/git/remotes/UpdateRemoteUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.remotes
+package com.jetpackduba.gitnuro.git.remotes
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/repository/GetRepositoryStateUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.repository
+package com.jetpackduba.gitnuro.git.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/repository/InitLocalRepositoryUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.repository
+package com.jetpackduba.gitnuro.git.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/repository/OpenRepositoryUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.repository
+package com.jetpackduba.gitnuro.git.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

src/main/kotlin/com/jetpackduba/gitnuro/git/repository/ResetRepositoryStateUseCase.kt

@@ -1,4 +1,4 @@
-package app.git.repository
+package com.jetpackduba.gitnuro.git.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext