Merge pull request #44 from Danil0v3s/feat/renamings

* rename packages

* fix paths

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
       uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
 
     - name: Build with Gradle Wrapper
-      run: ./gradlew :target:server:createDistributable
+      run: ./gradlew :target:desktop:createDistributable
 
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4

HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj

@@ -5,7 +5,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <ApplicationIcon>..\..\target\server\src\main\resources\imgs\favicon.ico</ApplicationIcon>
+        <ApplicationIcon>..\..\target\desktop\src\main\resources\imgs\favicon.ico</ApplicationIcon>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/HardwareMonitorData.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/HardwareMonitorData.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hardwaremonitor
+package app.cleanmeter.core.common.hardwaremonitor
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/PresentMonReading.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/PresentMonReading.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hardwaremonitor
+package app.cleanmeter.core.common.hardwaremonitor
 
 
 data class PresentMonReading(

core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/HwInfoData.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/HwInfoData.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hwinfo
+package app.cleanmeter.core.common.hwinfo
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorElement.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorElement.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hwinfo
+package app.cleanmeter.core.common.hwinfo
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingElement.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingElement.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hwinfo
+package app.cleanmeter.core.common.hwinfo
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingType.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingType.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hwinfo
+package app.cleanmeter.core.common.hwinfo
 
 enum class SensorReadingType(val value: Int) {
     None(0),

core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorSharedMem.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorSharedMem.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.hwinfo
+package app.cleanmeter.core.common.hwinfo
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Data.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Data.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.mahm
+package app.cleanmeter.core.common.mahm
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Entry.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Entry.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.mahm
+package app.cleanmeter.core.common.mahm
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/EntryFlag.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/EntryFlag.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.mahm
+package app.cleanmeter.core.common.mahm
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/GPUEntry.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/GPUEntry.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.mahm
+package app.cleanmeter.core.common.mahm
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Header.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Header.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.mahm
+package app.cleanmeter.core.common.mahm
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/SourceID.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/SourceID.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.mahm
+package app.cleanmeter.core.common.mahm
 
 import kotlinx.serialization.Serializable
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/dto/DataDTO.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/dto/DataDTO.kt

@@ -1,9 +1,9 @@
-package br.com.firstsoft.core.common.mahm.dto
+package app.cleanmeter.core.common.mahm.dto
 
 import kotlinx.serialization.Serializable
-import br.com.firstsoft.core.common.mahm.Data
-import br.com.firstsoft.core.common.mahm.Entry
-import br.com.firstsoft.core.common.mahm.SourceID
+import app.cleanmeter.core.common.mahm.Data
+import app.cleanmeter.core.common.mahm.Entry
+import app.cleanmeter.core.common.mahm.SourceID
 
 @Serializable
 data class DataDTO(

core/common/src/main/kotlin/br/com/firstsoft/core/common/process/SingleInstance.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/process/SingleInstance.kt

@@ -1,7 +1,7 @@
-package br.com.firstsoft.core.common.process
+package app.cleanmeter.core.common.process
 
-import br.com.firstsoft.core.common.reporting.ApplicationParams
-import br.com.firstsoft.core.common.reporting.setDefaultUncaughtExceptionHandler
+import app.cleanmeter.core.common.reporting.ApplicationParams
+import app.cleanmeter.core.common.reporting.setDefaultUncaughtExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/ApplicationParams.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/ApplicationParams.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.reporting
+package app.cleanmeter.core.common.reporting
 
 object ApplicationParams {
 

core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/LoggerUtils.kt → core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/LoggerUtils.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.common.reporting
+package app.cleanmeter.core.common.reporting
 
 import java.io.File
 

core/native/src/main/kotlin/br/com/firstsoft/core/os/ProcessManager.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/ProcessManager.kt

@@ -1,6 +1,6 @@
-package br.com.firstsoft.core.os
+package app.cleanmeter.core.os
 
-import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorProcessManager
+import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorProcessManager
 
 object ProcessManager {
 

core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt

@@ -1,6 +1,6 @@
-package br.com.firstsoft.core.os.hardwaremonitor
+package app.cleanmeter.core.os.hardwaremonitor
 
-import br.com.firstsoft.core.os.util.isDev
+import app.cleanmeter.core.os.util.isDev
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorReader.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt

@@ -1,8 +1,8 @@
-package br.com.firstsoft.core.os.hardwaremonitor
+package app.cleanmeter.core.os.hardwaremonitor
 
-import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData
-import br.com.firstsoft.core.os.util.getByteBuffer
-import br.com.firstsoft.core.os.util.readString
+import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData
+import app.cleanmeter.core.os.util.getByteBuffer
+import app.cleanmeter.core.os.util.readString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow

core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoProcessManager.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoProcessManager.kt

@@ -1,6 +1,6 @@
-package br.com.firstsoft.core.os.hwinfo
+package app.cleanmeter.core.os.hwinfo
 
-import br.com.firstsoft.core.os.resource.NativeResourceLoader
+import app.cleanmeter.core.os.resource.NativeResourceLoader
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoReader.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoReader.kt

@@ -1,17 +1,17 @@
-package br.com.firstsoft.core.os.hwinfo
+package app.cleanmeter.core.os.hwinfo
 
-import br.com.firstsoft.core.common.hwinfo.HwInfoData
-import br.com.firstsoft.core.common.hwinfo.SensorElement
-import br.com.firstsoft.core.common.hwinfo.SensorReadingElement
-import br.com.firstsoft.core.common.hwinfo.SensorReadingType
-import br.com.firstsoft.core.common.hwinfo.SensorSharedMem
+import app.cleanmeter.core.common.hwinfo.HwInfoData
+import app.cleanmeter.core.common.hwinfo.SensorElement
+import app.cleanmeter.core.common.hwinfo.SensorReadingElement
+import app.cleanmeter.core.common.hwinfo.SensorReadingType
+import app.cleanmeter.core.common.hwinfo.SensorSharedMem
 import com.sun.jna.Pointer
 import com.sun.jna.platform.win32.WinNT
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
-import br.com.firstsoft.core.os.util.getByteBuffer
-import br.com.firstsoft.core.os.util.readString
-import br.com.firstsoft.core.os.win32.WindowsService
+import app.cleanmeter.core.os.util.getByteBuffer
+import app.cleanmeter.core.os.util.readString
+import app.cleanmeter.core.os.win32.WindowsService
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import kotlin.coroutines.cancellation.CancellationException

core/native/src/main/kotlin/br/com/firstsoft/core/os/mahm/MahmReader.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/mahm/MahmReader.kt

@@ -1,21 +1,21 @@
-package br.com.firstsoft.core.os.mahm
-
-import br.com.firstsoft.core.common.mahm.Data
-import br.com.firstsoft.core.common.mahm.Entry
-import br.com.firstsoft.core.common.mahm.EntryFlag
-import br.com.firstsoft.core.common.mahm.GPUEntry
-import br.com.firstsoft.core.common.mahm.Header
-import br.com.firstsoft.core.common.mahm.SourceID
+package app.cleanmeter.core.os.mahm
+
+import app.cleanmeter.core.common.mahm.Data
+import app.cleanmeter.core.common.mahm.Entry
+import app.cleanmeter.core.common.mahm.EntryFlag
+import app.cleanmeter.core.common.mahm.GPUEntry
+import app.cleanmeter.core.common.mahm.Header
+import app.cleanmeter.core.common.mahm.SourceID
 import com.sun.jna.Pointer
 import com.sun.jna.platform.win32.WinNT
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
-import br.com.firstsoft.core.os.mahm.MAHMSizes.MAX_STRING_LENGTH
-import br.com.firstsoft.core.os.util.getByteBuffer
-import br.com.firstsoft.core.os.util.readString
-import br.com.firstsoft.core.os.win32.WindowsService
+import app.cleanmeter.core.os.mahm.MAHMSizes.MAX_STRING_LENGTH
+import app.cleanmeter.core.os.util.getByteBuffer
+import app.cleanmeter.core.os.util.readString
+import app.cleanmeter.core.os.win32.WindowsService
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.nio.charset.StandardCharsets

core/native/src/main/kotlin/br/com/firstsoft/core/os/resource/NativeResourceLoader.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/resource/NativeResourceLoader.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.os.resource
+package app.cleanmeter.core.os.resource
 
 object NativeResourceLoader {
     fun load(path: String): String {

core/native/src/main/kotlin/br/com/firstsoft/core/os/util/MemoryUtils.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/util/MemoryUtils.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.os.util
+package app.cleanmeter.core.os.util
 
 import com.sun.jna.Pointer
 import java.io.InputStream

core/native/src/main/kotlin/br/com/firstsoft/core/os/util/env.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/util/env.kt

@@ -1,3 +1,3 @@
-package br.com.firstsoft.core.os.util
+package app.cleanmeter.core.os.util
 
 fun isDev() = System.getenv("env") == "dev"

core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Kernel32Impl.java → core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Kernel32Impl.java

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.os.win32;
+package app.cleanmeter.core.os.win32;
 
 import com.sun.jna.Native;
 import com.sun.jna.win32.W32APIOptions;

core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Shell32Impl.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Shell32Impl.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.core.os.win32
+package app.cleanmeter.core.os.win32
 
 import com.sun.jna.Native
 import com.sun.jna.WString

core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WinRegistry.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WinRegistry.kt

@@ -1,6 +1,6 @@
-package br.com.firstsoft.core.os.win32
+package app.cleanmeter.core.os.win32
 
-import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorProcessManager
+import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorProcessManager
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.nio.file.Path

core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WindowsService.kt → core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WindowsService.kt

@@ -1,6 +1,6 @@
-package br.com.firstsoft.core.os.win32
+package app.cleanmeter.core.os.win32
 
-import br.com.firstsoft.core.os.util.isDev
+import app.cleanmeter.core.os.util.isDev
 import com.sun.jna.Native
 import com.sun.jna.Pointer
 import com.sun.jna.platform.win32.Kernel32

core/updater/src/main/kotlin/br/com/firstsoft/updater/AutoUpdater.kt → core/updater/src/main/kotlin/app/cleanmeter/updater/AutoUpdater.kt

@@ -1,7 +1,7 @@
-package br.com.firstsoft.updater
+package app.cleanmeter.updater
 
-import br.com.firstsoft.core.common.reporting.ApplicationParams
-import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorProcessManager
+import app.cleanmeter.core.common.reporting.ApplicationParams
+import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorProcessManager
 import io.github.z4kn4fein.semver.Version
 import io.github.z4kn4fein.semver.toVersion
 import io.ktor.client.HttpClient

settings.gradle.kts

@@ -39,7 +39,6 @@ rootProject.name = "CleanMeter"
 include(
     "core:common",
     "core:native",
-    "target:server"
+    "core:updater",
+    "target:desktop"
 )
-include("core:updater")
-findProject(":core:updater")?.name = "updater"

target/server/build.gradle.kts → target/desktop/build.gradle.kts

@@ -64,7 +64,7 @@ compose.desktop {
             }
         }
 
-        mainClass = "br.com.firstsoft.target.server.ServerMainKt"
+        mainClass = "app.cleanmeter.target.desktop.ServerMainKt"
 
         buildTypes.release.proguard {
             version.set("7.5.0")

target/server/src/main/kotlin/br/com/firstsoft/target/server/ApplicationViewModelStoreOwner.kt → target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ApplicationViewModelStoreOwner.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.target.server
+package app.cleanmeter.target.desktop
 
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner

target/server/src/main/kotlin/br/com/firstsoft/target/server/ComposeApp.kt → target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ComposeApp.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.target.server
+package app.cleanmeter.target.desktop
 
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -8,10 +8,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.window.application
 import androidx.lifecycle.viewmodel.compose.viewModel
-import br.com.firstsoft.core.common.reporting.ApplicationParams
-import br.com.firstsoft.core.os.ProcessManager
-import br.com.firstsoft.target.server.ui.overlay.OverlayWindow
-import br.com.firstsoft.target.server.ui.settings.SettingsWindow
+import app.cleanmeter.core.common.reporting.ApplicationParams
+import app.cleanmeter.core.os.ProcessManager
+import app.cleanmeter.target.desktop.ui.overlay.OverlayWindow
+import app.cleanmeter.target.desktop.ui.settings.SettingsWindow
 
 fun composeApp() = application {
     val viewModel: MainViewModel = viewModel(ApplicationViewModelStoreOwner)

target/server/src/main/kotlin/br/com/firstsoft/target/server/KeyboardHook.kt → target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/KeyboardHook.kt

@@ -1,4 +1,4 @@
-package br.com.firstsoft.target.server
+package app.cleanmeter.target.desktop
 
 import com.github.kwhat.jnativehook.GlobalScreen
 import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent

target/server/src/main/kotlin/br/com/firstsoft/target/server/MainViewModel.kt → target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/MainViewModel.kt

@@ -1,8 +1,8 @@
-package br.com.firstsoft.target.server
+package app.cleanmeter.target.desktop
 
 import androidx.lifecycle.ViewModel
-import br.com.firstsoft.target.server.data.OverlaySettingsRepository
-import br.com.firstsoft.target.server.model.OverlaySettings
+import app.cleanmeter.target.desktop.data.OverlaySettingsRepository
+import app.cleanmeter.target.desktop.model.OverlaySettings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow