TECH: renamed adb-server modules

KasperskyLab · Aug 23, 2023 · 1ef5fc9 · 1ef5fc9
1 parent 0a242d6
commit 1ef5fc9
Show file tree

Hide file tree

Showing 56 changed files with 19 additions and 19 deletions.
diff --git a/...server/adbserver-command-types/NOTICE.txt → ...erver/adb-server-command-types/NOTICE.txt b/...server/adbserver-command-types/NOTICE.txt → ...erver/adb-server-command-types/NOTICE.txt
diff --git a/.../adbserver-command-types/build.gradle.kts → ...adb-server-command-types/build.gradle.kts b/.../adbserver-command-types/build.gradle.kts → ...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/...rsky/adbserver/commandtypes/AdbCommand.kt → ...rsky/adbserver/commandtypes/AdbCommand.kt b/...rsky/adbserver/commandtypes/AdbCommand.kt → ...rsky/adbserver/commandtypes/AdbCommand.kt
diff --git a/...rsky/adbserver/commandtypes/CmdCommand.kt → ...rsky/adbserver/commandtypes/CmdCommand.kt b/...rsky/adbserver/commandtypes/CmdCommand.kt → ...rsky/adbserver/commandtypes/CmdCommand.kt
diff --git a/adb-server/adbserver-common/NOTICE.txt → adb-server/adb-server-common/NOTICE.txt b/adb-server/adbserver-common/NOTICE.txt → adb-server/adb-server-common/NOTICE.txt
diff --git a/adb-server/adbserver-common/build.gradle.kts → ...server/adb-server-common/build.gradle.kts b/adb-server/adbserver-common/build.gradle.kts → ...server/adb-server-common/build.gradle.kts
diff --git a/...kaspersky/adbserver/common/api/Command.kt → ...kaspersky/adbserver/common/api/Command.kt b/...kaspersky/adbserver/common/api/Command.kt → ...kaspersky/adbserver/common/api/Command.kt
diff --git a/...y/adbserver/common/api/CommandExecutor.kt → ...y/adbserver/common/api/CommandExecutor.kt b/...y/adbserver/common/api/CommandExecutor.kt → ...y/adbserver/common/api/CommandExecutor.kt
diff --git a/...sky/adbserver/common/api/CommandResult.kt → ...sky/adbserver/common/api/CommandResult.kt b/...sky/adbserver/common/api/CommandResult.kt → ...sky/adbserver/common/api/CommandResult.kt
diff --git a/...sky/adbserver/common/log/LoggerFactory.kt → ...sky/adbserver/common/log/LoggerFactory.kt b/...sky/adbserver/common/log/LoggerFactory.kt → ...sky/adbserver/common/log/LoggerFactory.kt
diff --git a/...mmon/log/filterlog/FullLoggerOptimiser.kt → ...mmon/log/filterlog/FullLoggerOptimiser.kt b/...mmon/log/filterlog/FullLoggerOptimiser.kt → ...mmon/log/filterlog/FullLoggerOptimiser.kt
diff --git a/...adbserver/common/log/filterlog/LogData.kt → ...adbserver/common/log/filterlog/LogData.kt b/...adbserver/common/log/filterlog/LogData.kt → ...adbserver/common/log/filterlog/LogData.kt
diff --git a/...erver/common/log/filterlog/LogRecorder.kt → ...erver/common/log/filterlog/LogRecorder.kt b/...erver/common/log/filterlog/LogRecorder.kt → ...erver/common/log/filterlog/LogRecorder.kt
diff --git a/...ver/common/log/filterlog/RecordAnswers.kt → ...ver/common/log/filterlog/RecordAnswers.kt b/...ver/common/log/filterlog/RecordAnswers.kt → ...ver/common/log/filterlog/RecordAnswers.kt
diff --git a/...erver/common/log/fulllogger/FullLogger.kt → ...erver/common/log/fulllogger/FullLogger.kt b/...erver/common/log/fulllogger/FullLogger.kt → ...erver/common/log/fulllogger/FullLogger.kt
diff --git a/...on/log/fulllogger/FullLoggerSystemImpl.kt → ...on/log/fulllogger/FullLoggerSystemImpl.kt b/...on/log/fulllogger/FullLoggerSystemImpl.kt → ...on/log/fulllogger/FullLoggerSystemImpl.kt
diff --git a/...server/common/log/logger/DesktopLogger.kt → ...server/common/log/logger/DesktopLogger.kt b/...server/common/log/logger/DesktopLogger.kt → ...server/common/log/logger/DesktopLogger.kt
diff --git a/...y/adbserver/common/log/logger/LogLevel.kt → ...y/adbserver/common/log/logger/LogLevel.kt b/...y/adbserver/common/log/logger/LogLevel.kt → ...y/adbserver/common/log/logger/LogLevel.kt
diff --git a/...sky/adbserver/common/log/logger/Logger.kt → ...sky/adbserver/common/log/logger/Logger.kt b/...sky/adbserver/common/log/logger/Logger.kt → ...sky/adbserver/common/log/logger/Logger.kt
diff --git a/...adbserver/common/log/logger/LoggerImpl.kt → ...adbserver/common/log/logger/LoggerImpl.kt b/...adbserver/common/log/logger/LoggerImpl.kt → ...adbserver/common/log/logger/LoggerImpl.kt
diff --git a/...r/common/log/utils/AdbLoggerReflection.kt → ...r/common/log/utils/AdbLoggerReflection.kt b/...r/common/log/utils/AdbLoggerReflection.kt → ...r/common/log/utils/AdbLoggerReflection.kt
diff --git a/...common/log/filterlog/FullLoggerForTest.kt → ...common/log/filterlog/FullLoggerForTest.kt b/...common/log/filterlog/FullLoggerForTest.kt → ...common/log/filterlog/FullLoggerForTest.kt
diff --git a/...ommon/log/filterlog/LoggerAnalyzerTest.kt → ...ommon/log/filterlog/LoggerAnalyzerTest.kt b/...ommon/log/filterlog/LoggerAnalyzerTest.kt → ...ommon/log/filterlog/LoggerAnalyzerTest.kt
diff --git a/adb-server/adbserver-connection/NOTICE.txt → adb-server/adb-server-connection/NOTICE.txt b/adb-server/adbserver-connection/NOTICE.txt → adb-server/adb-server-connection/NOTICE.txt
diff --git a/...ver/adbserver-connection/build.gradle.kts → ...er/adb-server-connection/build.gradle.kts b/...ver/adbserver-connection/build.gradle.kts → ...er/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/...dbserver/connection/api/BaseConnection.kt → ...dbserver/connection/api/BaseConnection.kt b/...dbserver/connection/api/BaseConnection.kt → ...dbserver/connection/api/BaseConnection.kt
diff --git a/...server/connection/api/ConnectionClient.kt → ...server/connection/api/ConnectionClient.kt b/...server/connection/api/ConnectionClient.kt → ...server/connection/api/ConnectionClient.kt
diff --git a/...nnection/api/ConnectionClientLifecycle.kt → ...nnection/api/ConnectionClientLifecycle.kt b/...nnection/api/ConnectionClientLifecycle.kt → ...nnection/api/ConnectionClientLifecycle.kt
diff --git a/...erver/connection/api/ConnectionFactory.kt → ...erver/connection/api/ConnectionFactory.kt b/...erver/connection/api/ConnectionFactory.kt → ...erver/connection/api/ConnectionFactory.kt
diff --git a/...server/connection/api/ConnectionServer.kt → ...server/connection/api/ConnectionServer.kt b/...server/connection/api/ConnectionServer.kt → ...server/connection/api/ConnectionServer.kt
diff --git a/...nnection/api/ConnectionServerLifecycle.kt → ...nnection/api/ConnectionServerLifecycle.kt b/...nnection/api/ConnectionServerLifecycle.kt → ...nnection/api/ConnectionServerLifecycle.kt
diff --git a/...mentation/ConnectionClientImplBySocket.kt → ...mentation/ConnectionClientImplBySocket.kt b/...mentation/ConnectionClientImplBySocket.kt → ...mentation/ConnectionClientImplBySocket.kt
diff --git a/...nection/implementation/ConnectionMaker.kt → ...nection/implementation/ConnectionMaker.kt b/...nection/implementation/ConnectionMaker.kt → ...nection/implementation/ConnectionMaker.kt
diff --git a/...mentation/ConnectionServerImplBySocket.kt → ...mentation/ConnectionServerImplBySocket.kt b/...mentation/ConnectionServerImplBySocket.kt → ...mentation/ConnectionServerImplBySocket.kt
diff --git a/...connection/implementation/ResultWaiter.kt → ...connection/implementation/ResultWaiter.kt b/...connection/implementation/ResultWaiter.kt → ...connection/implementation/ResultWaiter.kt
diff --git a/...ntation/lightsocket/LightSocketWrapper.kt → ...ntation/lightsocket/LightSocketWrapper.kt b/...ntation/lightsocket/LightSocketWrapper.kt → ...ntation/lightsocket/LightSocketWrapper.kt
diff --git a/...ion/lightsocket/LightSocketWrapperImpl.kt → ...ion/lightsocket/LightSocketWrapperImpl.kt b/...ion/lightsocket/LightSocketWrapperImpl.kt → ...ion/lightsocket/LightSocketWrapperImpl.kt
diff --git a/...tion/transferring/ExpectedEOFException.kt → ...tion/transferring/ExpectedEOFException.kt b/...tion/transferring/ExpectedEOFException.kt → ...tion/transferring/ExpectedEOFException.kt
diff --git a/...lementation/transferring/MessageModels.kt → ...lementation/transferring/MessageModels.kt b/...lementation/transferring/MessageModels.kt → ...lementation/transferring/MessageModels.kt
diff --git a/...ransferring/SocketMessagesTransferring.kt → ...ransferring/SocketMessagesTransferring.kt b/...ransferring/SocketMessagesTransferring.kt → ...ransferring/SocketMessagesTransferring.kt
diff --git a/...rver-desktop-device-connection/NOTICE.txt → ...rver-desktop-device-connection/NOTICE.txt b/...rver-desktop-device-connection/NOTICE.txt → ...rver-desktop-device-connection/NOTICE.txt
diff --git a/...esktop-device-connection/build.gradle.kts → ...esktop-device-connection/build.gradle.kts b/...esktop-device-connection/build.gradle.kts → ...esktop-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/...nnection/DesktopDeviceSocketConnection.kt → ...nnection/DesktopDeviceSocketConnection.kt b/...nnection/DesktopDeviceSocketConnection.kt → ...nnection/DesktopDeviceSocketConnection.kt
diff --git a/...n/DesktopDeviceSocketConnectionFactory.kt → ...n/DesktopDeviceSocketConnectionFactory.kt b/...n/DesktopDeviceSocketConnectionFactory.kt → ...n/DesktopDeviceSocketConnectionFactory.kt
diff --git a/...sktopDeviceSocketConnectionForwardImpl.kt → ...sktopDeviceSocketConnectionForwardImpl.kt b/...sktopDeviceSocketConnectionForwardImpl.kt → ...sktopDeviceSocketConnectionForwardImpl.kt
diff --git a/...tion/DesktopDeviceSocketConnectionType.kt → ...tion/DesktopDeviceSocketConnectionType.kt b/...tion/DesktopDeviceSocketConnectionType.kt → ...tion/DesktopDeviceSocketConnectionType.kt
diff --git a/adb-server/adbserver-device/NOTICE.txt → adb-server/adb-server-device/NOTICE.txt b/adb-server/adbserver-device/NOTICE.txt → adb-server/adb-server-device/NOTICE.txt
diff --git a/adb-server/adbserver-device/build.gradle.kts → ...server/adb-server-device/build.gradle.kts b/adb-server/adbserver-device/build.gradle.kts → ...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/...server/adbserver-device/gradle.properties → ...erver/adb-server-device/gradle.properties b/...server/adbserver-device/gradle.properties → ...erver/adb-server-device/gradle.properties
diff --git a/...kaspersky/adbserver/device/AdbTerminal.kt → ...kaspersky/adbserver/device/AdbTerminal.kt b/...kaspersky/adbserver/device/AdbTerminal.kt → ...kaspersky/adbserver/device/AdbTerminal.kt
diff --git a/...bserver/device/ConnectionTimeException.kt → ...bserver/device/ConnectionTimeException.kt b/...bserver/device/ConnectionTimeException.kt → ...bserver/device/ConnectionTimeException.kt
diff --git a/.../com/kaspersky/adbserver/device/Device.kt → .../com/kaspersky/adbserver/device/Device.kt b/.../com/kaspersky/adbserver/device/Device.kt → .../com/kaspersky/adbserver/device/Device.kt
diff --git 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
@@ -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
@@ -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
@@ -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",