From 1ef5fc91ebdaafa539db1a15c06b5b84d303236f Mon Sep 17 00:00:00 2001 From: Azamat Cherchesov Date: Wed, 23 Aug 2023 17:52:37 +0300 Subject: [PATCH] TECH: renamed adb-server modules --- .../NOTICE.txt | 0 .../build.gradle.kts | 2 +- .../com/kaspersky/adbserver/commandtypes/AdbCommand.kt | 0 .../com/kaspersky/adbserver/commandtypes/CmdCommand.kt | 0 .../{adbserver-common => adb-server-common}/NOTICE.txt | 0 .../build.gradle.kts | 0 .../java/com/kaspersky/adbserver/common/api/Command.kt | 0 .../kaspersky/adbserver/common/api/CommandExecutor.kt | 0 .../kaspersky/adbserver/common/api/CommandResult.kt | 0 .../kaspersky/adbserver/common/log/LoggerFactory.kt | 0 .../common/log/filterlog/FullLoggerOptimiser.kt | 0 .../adbserver/common/log/filterlog/LogData.kt | 0 .../adbserver/common/log/filterlog/LogRecorder.kt | 0 .../adbserver/common/log/filterlog/RecordAnswers.kt | 0 .../adbserver/common/log/fulllogger/FullLogger.kt | 0 .../common/log/fulllogger/FullLoggerSystemImpl.kt | 0 .../adbserver/common/log/logger/DesktopLogger.kt | 0 .../kaspersky/adbserver/common/log/logger/LogLevel.kt | 0 .../kaspersky/adbserver/common/log/logger/Logger.kt | 0 .../adbserver/common/log/logger/LoggerImpl.kt | 0 .../adbserver/common/log/utils/AdbLoggerReflection.kt | 0 .../common/log/filterlog/FullLoggerForTest.kt | 0 .../common/log/filterlog/LoggerAnalyzerTest.kt | 0 .../NOTICE.txt | 0 .../build.gradle.kts | 2 +- .../adbserver/connection/api/BaseConnection.kt | 0 .../adbserver/connection/api/ConnectionClient.kt | 0 .../connection/api/ConnectionClientLifecycle.kt | 0 .../adbserver/connection/api/ConnectionFactory.kt | 0 .../adbserver/connection/api/ConnectionServer.kt | 0 .../connection/api/ConnectionServerLifecycle.kt | 0 .../implementation/ConnectionClientImplBySocket.kt | 0 .../connection/implementation/ConnectionMaker.kt | 0 .../implementation/ConnectionServerImplBySocket.kt | 0 .../connection/implementation/ResultWaiter.kt | 0 .../implementation/lightsocket/LightSocketWrapper.kt | 0 .../lightsocket/LightSocketWrapperImpl.kt | 0 .../transferring/ExpectedEOFException.kt | 0 .../implementation/transferring/MessageModels.kt | 0 .../transferring/SocketMessagesTransferring.kt | 0 .../NOTICE.txt | 0 .../build.gradle.kts | 4 ++-- .../desdevconnection/DesktopDeviceSocketConnection.kt | 0 .../DesktopDeviceSocketConnectionFactory.kt | 0 .../DesktopDeviceSocketConnectionForwardImpl.kt | 0 .../DesktopDeviceSocketConnectionType.kt | 0 .../{adbserver-device => adb-server-device}/NOTICE.txt | 0 .../build.gradle.kts | 8 ++++---- .../gradle.properties | 0 .../java/com/kaspersky/adbserver/device/AdbTerminal.kt | 0 .../adbserver/device/ConnectionTimeException.kt | 0 .../main/java/com/kaspersky/adbserver/device/Device.kt | 0 adb-server/adbserver-desktop/build.gradle.kts | 8 ++++---- kaspresso/build.gradle.kts | 2 +- samples/adbserver-sample/build.gradle.kts | 2 +- settings.gradle.kts | 10 +++++----- 56 files changed, 19 insertions(+), 19 deletions(-) rename adb-server/{adbserver-command-types => adb-server-command-types}/NOTICE.txt (100%) rename adb-server/{adbserver-command-types => adb-server-command-types}/build.gradle.kts (83%) rename adb-server/{adbserver-command-types => adb-server-command-types}/src/main/java/com/kaspersky/adbserver/commandtypes/AdbCommand.kt (100%) rename adb-server/{adbserver-command-types => adb-server-command-types}/src/main/java/com/kaspersky/adbserver/commandtypes/CmdCommand.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/NOTICE.txt (100%) rename adb-server/{adbserver-common => adb-server-common}/build.gradle.kts (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/api/Command.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/api/CommandExecutor.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/api/CommandResult.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/LoggerFactory.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerOptimiser.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogData.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogRecorder.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/filterlog/RecordAnswers.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLogger.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLoggerSystemImpl.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/logger/DesktopLogger.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/logger/LogLevel.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/logger/Logger.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/logger/LoggerImpl.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/main/java/com/kaspersky/adbserver/common/log/utils/AdbLoggerReflection.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/test/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerForTest.kt (100%) rename adb-server/{adbserver-common => adb-server-common}/src/test/java/com/kaspersky/adbserver/common/log/filterlog/LoggerAnalyzerTest.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/NOTICE.txt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/build.gradle.kts (83%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/api/BaseConnection.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClient.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClientLifecycle.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionFactory.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServer.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServerLifecycle.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionClientImplBySocket.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionMaker.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionServerImplBySocket.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/ResultWaiter.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapper.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapperImpl.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/ExpectedEOFException.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/MessageModels.kt (100%) rename adb-server/{adbserver-connection => adb-server-connection}/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/SocketMessagesTransferring.kt (100%) rename adb-server/{adbserver-desktop-device-connection => adb-server-desktop-device-connection}/NOTICE.txt (100%) rename adb-server/{adbserver-desktop-device-connection => adb-server-desktop-device-connection}/build.gradle.kts (71%) rename adb-server/{adbserver-desktop-device-connection => adb-server-desktop-device-connection}/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnection.kt (100%) rename adb-server/{adbserver-desktop-device-connection => adb-server-desktop-device-connection}/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionFactory.kt (100%) rename adb-server/{adbserver-desktop-device-connection => adb-server-desktop-device-connection}/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionForwardImpl.kt (100%) rename adb-server/{adbserver-desktop-device-connection => adb-server-desktop-device-connection}/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionType.kt (100%) rename adb-server/{adbserver-device => adb-server-device}/NOTICE.txt (100%) rename adb-server/{adbserver-device => adb-server-device}/build.gradle.kts (57%) rename adb-server/{adbserver-device => adb-server-device}/gradle.properties (100%) rename adb-server/{adbserver-device => adb-server-device}/src/main/java/com/kaspersky/adbserver/device/AdbTerminal.kt (100%) rename adb-server/{adbserver-device => adb-server-device}/src/main/java/com/kaspersky/adbserver/device/ConnectionTimeException.kt (100%) rename adb-server/{adbserver-device => adb-server-device}/src/main/java/com/kaspersky/adbserver/device/Device.kt (100%) diff --git a/adb-server/adbserver-command-types/NOTICE.txt b/adb-server/adb-server-command-types/NOTICE.txt similarity index 100% rename from adb-server/adbserver-command-types/NOTICE.txt rename to adb-server/adb-server-command-types/NOTICE.txt diff --git a/adb-server/adbserver-command-types/build.gradle.kts b/adb-server/adb-server-command-types/build.gradle.kts similarity index 83% rename from adb-server/adbserver-command-types/build.gradle.kts rename to adb-server/adb-server-command-types/build.gradle.kts index 185ec8ec7..e097f9096 100644 --- a/adb-server/adbserver-command-types/build.gradle.kts +++ b/adb-server/adb-server-command-types/build.gradle.kts @@ -11,5 +11,5 @@ publish { dependencies { implementation(libs.kotlinStdlib) - implementation(projects.adbServer.adbserverCommon) + implementation(projects.adbServer.adbServerCommon) } diff --git a/adb-server/adbserver-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/AdbCommand.kt b/adb-server/adb-server-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/AdbCommand.kt similarity index 100% rename from adb-server/adbserver-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/AdbCommand.kt rename to adb-server/adb-server-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/AdbCommand.kt diff --git a/adb-server/adbserver-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/CmdCommand.kt b/adb-server/adb-server-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/CmdCommand.kt similarity index 100% rename from adb-server/adbserver-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/CmdCommand.kt rename to adb-server/adb-server-command-types/src/main/java/com/kaspersky/adbserver/commandtypes/CmdCommand.kt diff --git a/adb-server/adbserver-common/NOTICE.txt b/adb-server/adb-server-common/NOTICE.txt similarity index 100% rename from adb-server/adbserver-common/NOTICE.txt rename to adb-server/adb-server-common/NOTICE.txt diff --git a/adb-server/adbserver-common/build.gradle.kts b/adb-server/adb-server-common/build.gradle.kts similarity index 100% rename from adb-server/adbserver-common/build.gradle.kts rename to adb-server/adb-server-common/build.gradle.kts diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/api/Command.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/api/Command.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/api/Command.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/api/Command.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/api/CommandExecutor.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/api/CommandExecutor.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/api/CommandExecutor.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/api/CommandExecutor.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/api/CommandResult.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/api/CommandResult.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/api/CommandResult.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/api/CommandResult.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/LoggerFactory.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/LoggerFactory.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/LoggerFactory.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/LoggerFactory.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerOptimiser.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerOptimiser.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerOptimiser.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerOptimiser.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogData.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogData.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogData.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogData.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogRecorder.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogRecorder.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogRecorder.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/LogRecorder.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/RecordAnswers.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/RecordAnswers.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/RecordAnswers.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/filterlog/RecordAnswers.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLogger.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLogger.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLogger.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLogger.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLoggerSystemImpl.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLoggerSystemImpl.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLoggerSystemImpl.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/fulllogger/FullLoggerSystemImpl.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/DesktopLogger.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/DesktopLogger.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/DesktopLogger.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/DesktopLogger.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LogLevel.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LogLevel.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LogLevel.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LogLevel.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/Logger.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/Logger.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/Logger.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/Logger.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LoggerImpl.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LoggerImpl.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LoggerImpl.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/logger/LoggerImpl.kt diff --git a/adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/utils/AdbLoggerReflection.kt b/adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/utils/AdbLoggerReflection.kt similarity index 100% rename from adb-server/adbserver-common/src/main/java/com/kaspersky/adbserver/common/log/utils/AdbLoggerReflection.kt rename to adb-server/adb-server-common/src/main/java/com/kaspersky/adbserver/common/log/utils/AdbLoggerReflection.kt diff --git a/adb-server/adbserver-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerForTest.kt b/adb-server/adb-server-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerForTest.kt similarity index 100% rename from adb-server/adbserver-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerForTest.kt rename to adb-server/adb-server-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/FullLoggerForTest.kt diff --git a/adb-server/adbserver-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/LoggerAnalyzerTest.kt b/adb-server/adb-server-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/LoggerAnalyzerTest.kt similarity index 100% rename from adb-server/adbserver-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/LoggerAnalyzerTest.kt rename to adb-server/adb-server-common/src/test/java/com/kaspersky/adbserver/common/log/filterlog/LoggerAnalyzerTest.kt diff --git a/adb-server/adbserver-connection/NOTICE.txt b/adb-server/adb-server-connection/NOTICE.txt similarity index 100% rename from adb-server/adbserver-connection/NOTICE.txt rename to adb-server/adb-server-connection/NOTICE.txt diff --git a/adb-server/adbserver-connection/build.gradle.kts b/adb-server/adb-server-connection/build.gradle.kts similarity index 83% rename from adb-server/adbserver-connection/build.gradle.kts rename to adb-server/adb-server-connection/build.gradle.kts index 063ce3c6f..c81e96dc8 100644 --- a/adb-server/adbserver-connection/build.gradle.kts +++ b/adb-server/adb-server-connection/build.gradle.kts @@ -11,5 +11,5 @@ publish { dependencies { implementation(libs.kotlinStdlib) - implementation(projects.adbServer.adbserverCommon) + implementation(projects.adbServer.adbServerCommon) } diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/BaseConnection.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/BaseConnection.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/BaseConnection.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/BaseConnection.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClient.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClient.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClient.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClient.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClientLifecycle.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClientLifecycle.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClientLifecycle.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionClientLifecycle.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionFactory.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionFactory.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionFactory.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionFactory.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServer.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServer.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServer.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServer.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServerLifecycle.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServerLifecycle.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServerLifecycle.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/api/ConnectionServerLifecycle.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionClientImplBySocket.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionClientImplBySocket.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionClientImplBySocket.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionClientImplBySocket.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionMaker.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionMaker.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionMaker.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionMaker.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionServerImplBySocket.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionServerImplBySocket.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionServerImplBySocket.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ConnectionServerImplBySocket.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ResultWaiter.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ResultWaiter.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ResultWaiter.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/ResultWaiter.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapper.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapper.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapper.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapper.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapperImpl.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapperImpl.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapperImpl.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/lightsocket/LightSocketWrapperImpl.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/ExpectedEOFException.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/ExpectedEOFException.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/ExpectedEOFException.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/ExpectedEOFException.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/MessageModels.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/MessageModels.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/MessageModels.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/MessageModels.kt diff --git a/adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/SocketMessagesTransferring.kt b/adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/SocketMessagesTransferring.kt similarity index 100% rename from adb-server/adbserver-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/SocketMessagesTransferring.kt rename to adb-server/adb-server-connection/src/main/java/com/kaspersky/adbserver/connection/implementation/transferring/SocketMessagesTransferring.kt diff --git a/adb-server/adbserver-desktop-device-connection/NOTICE.txt b/adb-server/adb-server-desktop-device-connection/NOTICE.txt similarity index 100% rename from adb-server/adbserver-desktop-device-connection/NOTICE.txt rename to adb-server/adb-server-desktop-device-connection/NOTICE.txt diff --git a/adb-server/adbserver-desktop-device-connection/build.gradle.kts b/adb-server/adb-server-desktop-device-connection/build.gradle.kts similarity index 71% rename from adb-server/adbserver-desktop-device-connection/build.gradle.kts rename to adb-server/adb-server-desktop-device-connection/build.gradle.kts index 724af355d..cfb1b167d 100644 --- a/adb-server/adbserver-desktop-device-connection/build.gradle.kts +++ b/adb-server/adb-server-desktop-device-connection/build.gradle.kts @@ -11,6 +11,6 @@ publish { dependencies { implementation(libs.kotlinStdlib) - implementation(projects.adbServer.adbserverCommon) - implementation(projects.adbServer.adbserverCommandTypes) + implementation(projects.adbServer.adbServerCommon) + implementation(projects.adbServer.adbServerCommandTypes) } diff --git a/adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnection.kt b/adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnection.kt similarity index 100% rename from adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnection.kt rename to adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnection.kt diff --git a/adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionFactory.kt b/adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionFactory.kt similarity index 100% rename from adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionFactory.kt rename to adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionFactory.kt diff --git a/adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionForwardImpl.kt b/adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionForwardImpl.kt similarity index 100% rename from adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionForwardImpl.kt rename to adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionForwardImpl.kt diff --git a/adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionType.kt b/adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionType.kt similarity index 100% rename from adb-server/adbserver-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionType.kt rename to adb-server/adb-server-desktop-device-connection/src/main/java/com/kaspersky/adbserver/desdevconnection/DesktopDeviceSocketConnectionType.kt diff --git a/adb-server/adbserver-device/NOTICE.txt b/adb-server/adb-server-device/NOTICE.txt similarity index 100% rename from adb-server/adbserver-device/NOTICE.txt rename to adb-server/adb-server-device/NOTICE.txt diff --git a/adb-server/adbserver-device/build.gradle.kts b/adb-server/adb-server-device/build.gradle.kts similarity index 57% rename from adb-server/adbserver-device/build.gradle.kts rename to adb-server/adb-server-device/build.gradle.kts index 7cc51e805..1c64e458a 100644 --- a/adb-server/adbserver-device/build.gradle.kts +++ b/adb-server/adb-server-device/build.gradle.kts @@ -11,8 +11,8 @@ publish { dependencies { implementation(libs.kotlinStdlib) - api(projects.adbServer.adbserverCommon) - api(projects.adbServer.adbserverCommandTypes) - api(projects.adbServer.adbserverConnection) - api(projects.adbServer.adbserverDesktopDeviceConnection) + api(projects.adbServer.adbServerCommon) + api(projects.adbServer.adbServerCommandTypes) + api(projects.adbServer.adbServerConnection) + api(projects.adbServer.adbServerDesktopDeviceConnection) } diff --git a/adb-server/adbserver-device/gradle.properties b/adb-server/adb-server-device/gradle.properties similarity index 100% rename from adb-server/adbserver-device/gradle.properties rename to adb-server/adb-server-device/gradle.properties diff --git a/adb-server/adbserver-device/src/main/java/com/kaspersky/adbserver/device/AdbTerminal.kt b/adb-server/adb-server-device/src/main/java/com/kaspersky/adbserver/device/AdbTerminal.kt similarity index 100% rename from adb-server/adbserver-device/src/main/java/com/kaspersky/adbserver/device/AdbTerminal.kt rename to adb-server/adb-server-device/src/main/java/com/kaspersky/adbserver/device/AdbTerminal.kt diff --git a/adb-server/adbserver-device/src/main/java/com/kaspersky/adbserver/device/ConnectionTimeException.kt b/adb-server/adb-server-device/src/main/java/com/kaspersky/adbserver/device/ConnectionTimeException.kt similarity index 100% rename from adb-server/adbserver-device/src/main/java/com/kaspersky/adbserver/device/ConnectionTimeException.kt rename to adb-server/adb-server-device/src/main/java/com/kaspersky/adbserver/device/ConnectionTimeException.kt diff --git a/adb-server/adbserver-device/src/main/java/com/kaspersky/adbserver/device/Device.kt b/adb-server/adb-server-device/src/main/java/com/kaspersky/adbserver/device/Device.kt similarity index 100% rename from adb-server/adbserver-device/src/main/java/com/kaspersky/adbserver/device/Device.kt rename to adb-server/adb-server-device/src/main/java/com/kaspersky/adbserver/device/Device.kt diff --git a/adb-server/adbserver-desktop/build.gradle.kts b/adb-server/adbserver-desktop/build.gradle.kts index 68fabbf13..c10d41246 100644 --- a/adb-server/adbserver-desktop/build.gradle.kts +++ b/adb-server/adbserver-desktop/build.gradle.kts @@ -7,10 +7,10 @@ plugins { dependencies { implementation(libs.kotlinStdlib) implementation(libs.kotlinCli) - implementation(projects.adbServer.adbserverCommon) - implementation(projects.adbServer.adbserverCommandTypes) - implementation(projects.adbServer.adbserverConnection) - implementation(projects.adbServer.adbserverDesktopDeviceConnection) + implementation(projects.adbServer.adbServerCommon) + implementation(projects.adbServer.adbServerCommandTypes) + implementation(projects.adbServer.adbServerConnection) + implementation(projects.adbServer.adbServerDesktopDeviceConnection) } setProperty("mainClassName", "com.kaspersky.adbserver.desktop.MainKt") diff --git a/kaspresso/build.gradle.kts b/kaspresso/build.gradle.kts index 8bd1f3772..67315055f 100644 --- a/kaspresso/build.gradle.kts +++ b/kaspresso/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { implementation(libs.kotlinStdlib) implementation(libs.gson) - implementation(projects.adbServer.adbserverDevice) + implementation(projects.adbServer.adbServerDevice) implementation(libs.appcompat) implementation(libs.material) diff --git a/samples/adbserver-sample/build.gradle.kts b/samples/adbserver-sample/build.gradle.kts index 35a32975b..95453b4bc 100644 --- a/samples/adbserver-sample/build.gradle.kts +++ b/samples/adbserver-sample/build.gradle.kts @@ -11,6 +11,6 @@ android { dependencies { implementation(libs.kotlinStdlib) implementation(libs.appcompat) - implementation(projects.adbServer.adbserverDevice) + implementation(projects.adbServer.adbServerDevice) implementation(libs.multidex) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 8679062d6..f334765f9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,12 +26,12 @@ dependencyResolutionManagement { includeBuild("build-logic") include( - ":adb-server:adbserver-command-types", - ":adb-server:adbserver-common", - ":adb-server:adbserver-connection", + ":adb-server:adb-server-command-types", + ":adb-server:adb-server-common", + ":adb-server:adb-server-connection", ":adb-server:adbserver-desktop", - ":adb-server:adbserver-desktop-device-connection", - ":adb-server:adbserver-device", + ":adb-server:adb-server-desktop-device-connection", + ":adb-server:adb-server-device", ":kaspresso", ":kautomator",