feat: Extract Android library

appium · Jul 8, 2024 · 040ba39 · 040ba39
1 parent 1aeb5e8
commit 040ba39
Show file tree

Hide file tree

Showing 276 changed files with 107 additions and 79 deletions.
diff --git a/espresso-server/app/build.gradle.kts b/espresso-server/app/build.gradle.kts
@@ -11,7 +11,6 @@ val appiumTargetPackage: String by project
 val appiumSourceCompatibility: String by project
 val appiumTargetCompatibility: String by project
 val appiumJvmTarget: String by project
-val appiumAndroidGradlePlugin: String by project
 val appiumKotlin: String by project
 val appiumAndroidxTestVersion: String by project
 val appiumAnnotationVersion: String by project
@@ -27,6 +26,8 @@ val appiumUiAutomatorVersion: String by project
 android {
     compileSdk = appiumCompileSdk.toInt()
     buildToolsVersion = appiumBuildTools
+    namespace = "io.appium.espressoserver"
+
     defaultConfig {
         // <instrumentation android:targetPackage=""/>
         applicationId = appiumTargetPackage
@@ -48,16 +49,6 @@ android {
         }
     }
 
-    sourceSets {
-        getByName("test") {
-            java.srcDirs("src/androidTest/java")
-        }
-    }
-
-    testOptions {
-        unitTests.isReturnDefaultValues = true
-    }
-
     signingConfigs {
         getByName("debug") {
             findProperty("appiumKeystoreFile")?.also {
@@ -90,71 +81,13 @@ android {
     packaging {
         resources.excludes.add("META-INF/**")
     }
-
-    namespace = "io.appium.espressoserver"
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    // additionalAppDependencies placeholder (don't change or delete this line)
-
-    testImplementation("androidx.annotation:annotation:$appiumAnnotationVersion")
-    testImplementation("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion")
-    testImplementation("androidx.test.espresso:espresso-core:$appiumEspressoVersion")
-    testImplementation("androidx.test.espresso:espresso-web:$appiumEspressoVersion")
-    testImplementation("androidx.test.uiautomator:uiautomator:$appiumUiAutomatorVersion")
-    testImplementation("androidx.test:core:$appiumAndroidxTestVersion")
-    testImplementation("androidx.test:runner:$appiumAndroidxTestVersion")
-    testImplementation("androidx.test:rules:$appiumAndroidxTestVersion")
-    testImplementation("com.google.code.gson:gson:$appiumGsonVersion")
-    testImplementation("junit:junit:$appiumJUnitVersion")
-    testImplementation("org.mockito:mockito-core:$appiumMockitoVersion")
-    testImplementation("org.nanohttpd:nanohttpd-webserver:$appiumNanohttpdVersion")
-    testImplementation("org.robolectric:robolectric:$appiumRobolectricVersion")
-    testImplementation("org.jetbrains.kotlin:kotlin-test:$appiumKotlin")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$appiumKotlin")
-    testImplementation("org.jetbrains.kotlin:kotlin-reflect:$appiumKotlin")
-    testImplementation("androidx.compose.ui:ui-test:$appiumComposeVersion")
-    testImplementation("androidx.compose.ui:ui-test-junit4:$appiumComposeVersion")
-
-    androidTestImplementation("androidx.annotation:annotation:$appiumAnnotationVersion")
-    androidTestImplementation("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion") {
-        // Exclude transitive dependencies to limit conflicts with AndroidX libraries from AUT.
-        // Link to PR with fix and discussion https://github.com/appium/appium-espresso-driver/pull/596
-        isTransitive = false
-    }
-    androidTestImplementation("androidx.test.espresso:espresso-web:$appiumEspressoVersion") {
-        because("Espresso Web Atoms support (mobile: webAtoms)")
-    }
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:$appiumUiAutomatorVersion") {
-        because("UiAutomator support (mobile: uiautomator)")
-    }
+    androidTestImplementation(project(":library"))
+    androidTestImplementation("junit:junit:$appiumJUnitVersion")
     androidTestImplementation("androidx.test:core:$appiumAndroidxTestVersion")
     androidTestImplementation("androidx.test:runner:$appiumAndroidxTestVersion")
-    androidTestImplementation("androidx.test:rules:$appiumAndroidxTestVersion")
-    androidTestImplementation("com.google.code.gson:gson:$appiumGsonVersion")
-    androidTestImplementation("org.nanohttpd:nanohttpd-webserver:$appiumNanohttpdVersion")
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$appiumKotlin")
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-reflect:$appiumKotlin")
-    androidTestImplementation("androidx.compose.ui:ui-test:$appiumComposeVersion") {
-        because("Android Compose support")
-    }
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$appiumComposeVersion") {
-        because("Android Compose support")
-    }
 
     // additionalAndroidTestDependencies placeholder (don't change or delete this line)
 }
-
-configurations.all {
-    resolutionStrategy.eachDependency {
-        // To avoid "androidx.annotation:annotation" version conflict.
-        if (requested.group == "androidx.annotation" && !requested.name.contains("annotation")) {
-            useVersion(appiumAnnotationVersion)
-        }
-    }
-}
-
-tasks.withType<Test> {
-    systemProperty("skipespressoserver", "true")
-}
diff --git a/...esso-server/app/src/androidTest/java/io/appium/espressoserver/EspressoServerRunnerTest.kt b/...esso-server/app/src/androidTest/java/io/appium/espressoserver/EspressoServerRunnerTest.kt
@@ -19,7 +19,6 @@ package io.appium.espressoserver
 import androidx.test.filters.LargeTest
 import io.appium.espressoserver.lib.http.Server
 import org.junit.Assert.assertEquals
-import org.junit.Assume
 import org.junit.Rule
 import org.junit.Test
 
@@ -36,10 +35,6 @@ class EspressoServerRunnerTest {
 
     @Test
     fun startEspressoServer() {
-        if (System.getProperty("skipespressoserver") != null) {
-            Assume.assumeTrue(true)
-            return
-        }
         server.run()
 
         assertEquals(true, true) // Keep Codacy happy

diff --git a/espresso-server/build.gradle.kts b/espresso-server/build.gradle.kts
@@ -22,6 +22,8 @@ allprojects {
         google()
         mavenCentral()
     }
+
+    group = "io.appium.espressoserver"
 }
 
 tasks.register("clean", Delete::class) {

diff --git a/espresso-server/library/build.gradle.kts b/espresso-server/library/build.gradle.kts
@@ -0,0 +1,90 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+}
+
+val appiumCompileSdk: String by project
+val appiumMinSdk: String by project
+val appiumTargetSdk: String by project
+val appiumBuildTools: String by project
+val appiumSourceCompatibility: String by project
+val appiumTargetCompatibility: String by project
+val appiumJvmTarget: String by project
+val appiumKotlin: String by project
+val appiumAndroidxTestVersion: String by project
+val appiumAnnotationVersion: String by project
+val appiumComposeVersion: String by project
+val appiumGsonVersion: String by project
+val appiumEspressoVersion: String by project
+val appiumNanohttpdVersion: String by project
+val appiumRobolectricVersion: String by project
+val appiumJUnitVersion: String by project
+val appiumUiAutomatorVersion: String by project
+
+android {
+    compileSdk = appiumCompileSdk.toInt()
+    buildToolsVersion = appiumBuildTools
+    namespace = "io.appium.espressoserver.lib"
+
+    defaultConfig {
+        minSdk = appiumMinSdk.toInt()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf(appiumSourceCompatibility.uppercase())
+        targetCompatibility = JavaVersion.valueOf(appiumTargetCompatibility.uppercase())
+    }
+
+    packaging {
+        resources.excludes.add("META-INF/**")
+    }
+
+    kotlinOptions {
+        jvmTarget = appiumJvmTarget
+    }
+
+    lint {
+        targetSdk = appiumTargetSdk.toInt()
+    }
+
+    testOptions {
+        targetSdk = appiumTargetSdk.toInt()
+        unitTests.isReturnDefaultValues = true
+    }
+}
+
+dependencies {
+    // additionalAppDependencies placeholder (don't change or delete this line)
+
+    api("androidx.annotation:annotation:$appiumAnnotationVersion")
+    api("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion") {
+        // Exclude transitive dependencies to limit conflicts with AndroidX libraries from AUT.
+        // Link to PR with fix and discussion https://github.com/appium/appium-espresso-driver/pull/596
+        isTransitive = false
+    }
+    api("androidx.test.espresso:espresso-web:$appiumEspressoVersion") {
+        because("Espresso Web Atoms support (mobile: webAtoms)")
+    }
+    api("androidx.test.uiautomator:uiautomator:$appiumUiAutomatorVersion") {
+        because("UiAutomator support (mobile: uiautomator)")
+    }
+    api("androidx.test:core:$appiumAndroidxTestVersion")
+    api("androidx.test:runner:$appiumAndroidxTestVersion")
+    api("androidx.test:rules:$appiumAndroidxTestVersion")
+    api("com.google.code.gson:gson:$appiumGsonVersion")
+    api("org.nanohttpd:nanohttpd-webserver:$appiumNanohttpdVersion")
+    api("org.jetbrains.kotlin:kotlin-stdlib:$appiumKotlin")
+    api("org.jetbrains.kotlin:kotlin-reflect:$appiumKotlin")
+    api("androidx.compose.ui:ui-test:$appiumComposeVersion") {
+        because("Android Compose support")
+    }
+    api("androidx.compose.ui:ui-test-junit4:$appiumComposeVersion") {
+        because("Android Compose support")
+    }
+
+    testImplementation("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion")
+    testImplementation("junit:junit:$appiumJUnitVersion")
+    testImplementation("org.robolectric:robolectric:$appiumRobolectricVersion")
+    testImplementation("org.jetbrains.kotlin:kotlin-test:$appiumKotlin")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$appiumKotlin")
+}
diff --git a/espresso-server/library/src/main/AndroidManifest.xml b/espresso-server/library/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+</manifest>
diff --git a/...pressoserver/lib/drivers/DriverContext.kt → ...pressoserver/lib/drivers/DriverContext.kt b/...pressoserver/lib/drivers/DriverContext.kt → ...pressoserver/lib/drivers/DriverContext.kt
diff --git a/...spressoserver/lib/handlers/AcceptAlert.kt → ...spressoserver/lib/handlers/AcceptAlert.kt b/...spressoserver/lib/handlers/AcceptAlert.kt → ...spressoserver/lib/handlers/AcceptAlert.kt
diff --git a/...ppium/espressoserver/lib/handlers/Back.kt → ...ppium/espressoserver/lib/handlers/Back.kt b/...ppium/espressoserver/lib/handlers/Back.kt → ...ppium/espressoserver/lib/handlers/Back.kt
diff --git a/...pium/espressoserver/lib/handlers/Clear.kt → ...pium/espressoserver/lib/handlers/Clear.kt b/...pium/espressoserver/lib/handlers/Clear.kt → ...pium/espressoserver/lib/handlers/Clear.kt
diff --git a/...pium/espressoserver/lib/handlers/Click.kt → ...pium/espressoserver/lib/handlers/Click.kt b/...pium/espressoserver/lib/handlers/Click.kt → ...pium/espressoserver/lib/handlers/Click.kt
diff --git a/...ressoserver/lib/handlers/CreateSession.kt → ...ressoserver/lib/handlers/CreateSession.kt b/...ressoserver/lib/handlers/CreateSession.kt → ...ressoserver/lib/handlers/CreateSession.kt
diff --git a/...ressoserver/lib/handlers/DeleteSession.kt → ...ressoserver/lib/handlers/DeleteSession.kt b/...ressoserver/lib/handlers/DeleteSession.kt → ...ressoserver/lib/handlers/DeleteSession.kt
diff --git a/...pressoserver/lib/handlers/DismissAlert.kt → ...pressoserver/lib/handlers/DismissAlert.kt b/...pressoserver/lib/handlers/DismissAlert.kt → ...pressoserver/lib/handlers/DismissAlert.kt
diff --git a/...erver/lib/handlers/DrawerActionHandler.kt → ...erver/lib/handlers/DrawerActionHandler.kt b/...erver/lib/handlers/DrawerActionHandler.kt → ...erver/lib/handlers/DrawerActionHandler.kt
diff --git a/...ressoserver/lib/handlers/ElementEquals.kt → ...ressoserver/lib/handlers/ElementEquals.kt b/...ressoserver/lib/handlers/ElementEquals.kt → ...ressoserver/lib/handlers/ElementEquals.kt
diff --git a/...oserver/lib/handlers/ElementScreenshot.kt → ...oserver/lib/handlers/ElementScreenshot.kt b/...oserver/lib/handlers/ElementScreenshot.kt → ...oserver/lib/handlers/ElementScreenshot.kt
diff --git a/...pressoserver/lib/handlers/ElementValue.kt → ...pressoserver/lib/handlers/ElementValue.kt b/...pressoserver/lib/handlers/ElementValue.kt → ...pressoserver/lib/handlers/ElementValue.kt
diff --git a/...espressoserver/lib/handlers/FindActive.kt → ...espressoserver/lib/handlers/FindActive.kt b/...espressoserver/lib/handlers/FindActive.kt → ...espressoserver/lib/handlers/FindActive.kt
diff --git a/...spressoserver/lib/handlers/FindElement.kt → ...spressoserver/lib/handlers/FindElement.kt b/...spressoserver/lib/handlers/FindElement.kt → ...spressoserver/lib/handlers/FindElement.kt
diff --git a/...pressoserver/lib/handlers/FindElements.kt → ...pressoserver/lib/handlers/FindElements.kt b/...pressoserver/lib/handlers/FindElements.kt → ...pressoserver/lib/handlers/FindElements.kt
diff --git a/...pressoserver/lib/handlers/GetAlertText.kt → ...pressoserver/lib/handlers/GetAlertText.kt b/...pressoserver/lib/handlers/GetAlertText.kt → ...pressoserver/lib/handlers/GetAlertText.kt
diff --git a/...pressoserver/lib/handlers/GetAttribute.kt → ...pressoserver/lib/handlers/GetAttribute.kt b/...pressoserver/lib/handlers/GetAttribute.kt → ...pressoserver/lib/handlers/GetAttribute.kt
diff --git a/...pressoserver/lib/handlers/GetClipboard.kt → ...pressoserver/lib/handlers/GetClipboard.kt b/...pressoserver/lib/handlers/GetClipboard.kt → ...pressoserver/lib/handlers/GetClipboard.kt
diff --git a/...ressoserver/lib/handlers/GetDeviceInfo.kt → ...ressoserver/lib/handlers/GetDeviceInfo.kt b/...ressoserver/lib/handlers/GetDeviceInfo.kt → ...ressoserver/lib/handlers/GetDeviceInfo.kt
diff --git a/...oserver/lib/handlers/GetDisplayDensity.kt → ...oserver/lib/handlers/GetDisplayDensity.kt b/...oserver/lib/handlers/GetDisplayDensity.kt → ...oserver/lib/handlers/GetDisplayDensity.kt
diff --git a/...pressoserver/lib/handlers/GetDisplayed.kt → ...pressoserver/lib/handlers/GetDisplayed.kt b/...pressoserver/lib/handlers/GetDisplayed.kt → ...pressoserver/lib/handlers/GetDisplayed.kt
diff --git a/...espressoserver/lib/handlers/GetEnabled.kt → ...espressoserver/lib/handlers/GetEnabled.kt b/...espressoserver/lib/handlers/GetEnabled.kt → ...espressoserver/lib/handlers/GetEnabled.kt
diff --git a/...spressoserver/lib/handlers/GetLocation.kt → ...spressoserver/lib/handlers/GetLocation.kt b/...spressoserver/lib/handlers/GetLocation.kt → ...spressoserver/lib/handlers/GetLocation.kt
diff --git a/...oserver/lib/handlers/GetLocationInView.kt → ...oserver/lib/handlers/GetLocationInView.kt b/...oserver/lib/handlers/GetLocationInView.kt → ...oserver/lib/handlers/GetLocationInView.kt
diff --git a/...um/espressoserver/lib/handlers/GetName.kt → ...um/espressoserver/lib/handlers/GetName.kt b/...um/espressoserver/lib/handlers/GetName.kt → ...um/espressoserver/lib/handlers/GetName.kt
diff --git a/...essoserver/lib/handlers/GetOrientation.kt → ...essoserver/lib/handlers/GetOrientation.kt b/...essoserver/lib/handlers/GetOrientation.kt → ...essoserver/lib/handlers/GetOrientation.kt
diff --git a/...um/espressoserver/lib/handlers/GetRect.kt → ...um/espressoserver/lib/handlers/GetRect.kt b/...um/espressoserver/lib/handlers/GetRect.kt → ...um/espressoserver/lib/handlers/GetRect.kt
diff --git a/...spressoserver/lib/handlers/GetRotation.kt → ...spressoserver/lib/handlers/GetRotation.kt b/...spressoserver/lib/handlers/GetRotation.kt → ...spressoserver/lib/handlers/GetRotation.kt
diff --git a/...spressoserver/lib/handlers/GetSelected.kt → ...spressoserver/lib/handlers/GetSelected.kt b/...spressoserver/lib/handlers/GetSelected.kt → ...spressoserver/lib/handlers/GetSelected.kt
diff --git a/...espressoserver/lib/handlers/GetSession.kt → ...espressoserver/lib/handlers/GetSession.kt b/...espressoserver/lib/handlers/GetSession.kt → ...espressoserver/lib/handlers/GetSession.kt
diff --git a/...spressoserver/lib/handlers/GetSessions.kt → ...spressoserver/lib/handlers/GetSessions.kt b/...spressoserver/lib/handlers/GetSessions.kt → ...spressoserver/lib/handlers/GetSessions.kt
diff --git a/...spressoserver/lib/handlers/GetSettings.kt → ...spressoserver/lib/handlers/GetSettings.kt b/...spressoserver/lib/handlers/GetSettings.kt → ...spressoserver/lib/handlers/GetSettings.kt
diff --git a/...um/espressoserver/lib/handlers/GetSize.kt → ...um/espressoserver/lib/handlers/GetSize.kt b/...um/espressoserver/lib/handlers/GetSize.kt → ...um/espressoserver/lib/handlers/GetSize.kt
diff --git a/...server/lib/handlers/GetToastVisibility.kt → ...server/lib/handlers/GetToastVisibility.kt b/...server/lib/handlers/GetToastVisibility.kt → ...server/lib/handlers/GetToastVisibility.kt
diff --git a/...ressoserver/lib/handlers/GetWindowRect.kt → ...ressoserver/lib/handlers/GetWindowRect.kt b/...ressoserver/lib/handlers/GetWindowRect.kt → ...ressoserver/lib/handlers/GetWindowRect.kt
diff --git a/...ressoserver/lib/handlers/GetWindowSize.kt → ...ressoserver/lib/handlers/GetWindowSize.kt b/...ressoserver/lib/handlers/GetWindowSize.kt → ...ressoserver/lib/handlers/GetWindowSize.kt
diff --git a/...pressoserver/lib/handlers/HideKeyboard.kt → ...pressoserver/lib/handlers/HideKeyboard.kt b/...pressoserver/lib/handlers/HideKeyboard.kt → ...pressoserver/lib/handlers/HideKeyboard.kt
diff --git a/...ppium/espressoserver/lib/handlers/Keys.kt → ...ppium/espressoserver/lib/handlers/Keys.kt b/...ppium/espressoserver/lib/handlers/Keys.kt → ...ppium/espressoserver/lib/handlers/Keys.kt
diff --git a/...erver/lib/handlers/ListIdlingResources.kt → ...erver/lib/handlers/ListIdlingResources.kt b/...erver/lib/handlers/ListIdlingResources.kt → ...erver/lib/handlers/ListIdlingResources.kt
diff --git a/...essoserver/lib/handlers/MobileBackdoor.kt → ...essoserver/lib/handlers/MobileBackdoor.kt b/...essoserver/lib/handlers/MobileBackdoor.kt → ...essoserver/lib/handlers/MobileBackdoor.kt
diff --git a/...oserver/lib/handlers/MobileClickAction.kt → ...oserver/lib/handlers/MobileClickAction.kt b/...oserver/lib/handlers/MobileClickAction.kt → ...oserver/lib/handlers/MobileClickAction.kt
diff --git a/...spressoserver/lib/handlers/MobileSwipe.kt → ...spressoserver/lib/handlers/MobileSwipe.kt b/...spressoserver/lib/handlers/MobileSwipe.kt → ...spressoserver/lib/handlers/MobileSwipe.kt
diff --git a/...ssoserver/lib/handlers/MobileViewFlash.kt → ...ssoserver/lib/handlers/MobileViewFlash.kt b/...ssoserver/lib/handlers/MobileViewFlash.kt → ...ssoserver/lib/handlers/MobileViewFlash.kt
diff --git a/...ium/espressoserver/lib/handlers/MoveTo.kt → ...ium/espressoserver/lib/handlers/MoveTo.kt b/...ium/espressoserver/lib/handlers/MoveTo.kt → ...ium/espressoserver/lib/handlers/MoveTo.kt
diff --git a/...soserver/lib/handlers/MultiTouchAction.kt → ...soserver/lib/handlers/MultiTouchAction.kt b/...soserver/lib/handlers/MultiTouchAction.kt → ...soserver/lib/handlers/MultiTouchAction.kt
diff --git a/...espressoserver/lib/handlers/NavigateTo.kt → ...espressoserver/lib/handlers/NavigateTo.kt b/...espressoserver/lib/handlers/NavigateTo.kt → ...espressoserver/lib/handlers/NavigateTo.kt
diff --git a/...r/lib/handlers/NoSessionCommandHandler.kt → ...r/lib/handlers/NoSessionCommandHandler.kt b/...r/lib/handlers/NoSessionCommandHandler.kt → ...r/lib/handlers/NoSessionCommandHandler.kt
diff --git a/...oserver/lib/handlers/NotYetImplemented.kt → ...oserver/lib/handlers/NotYetImplemented.kt b/...oserver/lib/handlers/NotYetImplemented.kt → ...oserver/lib/handlers/NotYetImplemented.kt
diff --git a/...oserver/lib/handlers/OpenNotifications.kt → ...oserver/lib/handlers/OpenNotifications.kt b/...oserver/lib/handlers/OpenNotifications.kt → ...oserver/lib/handlers/OpenNotifications.kt
diff --git a/...ressoserver/lib/handlers/PerformAction.kt → ...ressoserver/lib/handlers/PerformAction.kt b/...ressoserver/lib/handlers/PerformAction.kt → ...ressoserver/lib/handlers/PerformAction.kt
diff --git a/.../lib/handlers/PerformAutofillDismissal.kt → .../lib/handlers/PerformAutofillDismissal.kt b/.../lib/handlers/PerformAutofillDismissal.kt → .../lib/handlers/PerformAutofillDismissal.kt
diff --git a/...erver/lib/handlers/PerformEditorAction.kt → ...erver/lib/handlers/PerformEditorAction.kt b/...erver/lib/handlers/PerformEditorAction.kt → ...erver/lib/handlers/PerformEditorAction.kt
diff --git a/...erver/lib/handlers/PointerEventHandler.kt → ...erver/lib/handlers/PointerEventHandler.kt b/...erver/lib/handlers/PointerEventHandler.kt → ...erver/lib/handlers/PointerEventHandler.kt
diff --git a/...pressoserver/lib/handlers/PressKeyCode.kt → ...pressoserver/lib/handlers/PressKeyCode.kt b/...pressoserver/lib/handlers/PressKeyCode.kt → ...pressoserver/lib/handlers/PressKeyCode.kt
diff --git a/...r/lib/handlers/RegisterIdlingResources.kt → ...r/lib/handlers/RegisterIdlingResources.kt b/...r/lib/handlers/RegisterIdlingResources.kt → ...r/lib/handlers/RegisterIdlingResources.kt
diff --git a/...essoserver/lib/handlers/ReleaseActions.kt → ...essoserver/lib/handlers/ReleaseActions.kt b/...essoserver/lib/handlers/ReleaseActions.kt → ...essoserver/lib/handlers/ReleaseActions.kt
diff --git a/...essoserver/lib/handlers/RequestHandler.kt → ...essoserver/lib/handlers/RequestHandler.kt b/...essoserver/lib/handlers/RequestHandler.kt → ...essoserver/lib/handlers/RequestHandler.kt
diff --git a/...oserver/lib/handlers/ScreenshotHandler.kt → ...oserver/lib/handlers/ScreenshotHandler.kt b/...oserver/lib/handlers/ScreenshotHandler.kt → ...oserver/lib/handlers/ScreenshotHandler.kt
diff --git a/...pressoserver/lib/handlers/ScrollToPage.kt → ...pressoserver/lib/handlers/ScrollToPage.kt b/...pressoserver/lib/handlers/ScrollToPage.kt → ...pressoserver/lib/handlers/ScrollToPage.kt
diff --git a/...pressoserver/lib/handlers/SetClipboard.kt → ...pressoserver/lib/handlers/SetClipboard.kt b/...pressoserver/lib/handlers/SetClipboard.kt → ...pressoserver/lib/handlers/SetClipboard.kt
diff --git a/...um/espressoserver/lib/handlers/SetDate.kt → ...um/espressoserver/lib/handlers/SetDate.kt b/...um/espressoserver/lib/handlers/SetDate.kt → ...um/espressoserver/lib/handlers/SetDate.kt
diff --git a/...essoserver/lib/handlers/SetOrientation.kt → ...essoserver/lib/handlers/SetOrientation.kt b/...essoserver/lib/handlers/SetOrientation.kt → ...essoserver/lib/handlers/SetOrientation.kt
diff --git a/...spressoserver/lib/handlers/SetRotation.kt → ...spressoserver/lib/handlers/SetRotation.kt b/...spressoserver/lib/handlers/SetRotation.kt → ...spressoserver/lib/handlers/SetRotation.kt
diff --git a/...um/espressoserver/lib/handlers/SetTime.kt → ...um/espressoserver/lib/handlers/SetTime.kt b/...um/espressoserver/lib/handlers/SetTime.kt → ...um/espressoserver/lib/handlers/SetTime.kt
diff --git a/...ium/espressoserver/lib/handlers/Source.kt → ...ium/espressoserver/lib/handlers/Source.kt b/...ium/espressoserver/lib/handlers/Source.kt → ...ium/espressoserver/lib/handlers/Source.kt
diff --git a/...ressoserver/lib/handlers/StartActivity.kt → ...ressoserver/lib/handlers/StartActivity.kt b/...ressoserver/lib/handlers/StartActivity.kt → ...ressoserver/lib/handlers/StartActivity.kt
diff --git a/...pressoserver/lib/handlers/StartService.kt → ...pressoserver/lib/handlers/StartService.kt b/...pressoserver/lib/handlers/StartService.kt → ...pressoserver/lib/handlers/StartService.kt
diff --git a/...ium/espressoserver/lib/handlers/Status.kt → ...ium/espressoserver/lib/handlers/Status.kt b/...ium/espressoserver/lib/handlers/Status.kt → ...ium/espressoserver/lib/handlers/Status.kt
diff --git a/...spressoserver/lib/handlers/StopService.kt → ...spressoserver/lib/handlers/StopService.kt b/...spressoserver/lib/handlers/StopService.kt → ...spressoserver/lib/handlers/StopService.kt
diff --git a/...ppium/espressoserver/lib/handlers/Text.kt → ...ppium/espressoserver/lib/handlers/Text.kt b/...ppium/espressoserver/lib/handlers/Text.kt → ...ppium/espressoserver/lib/handlers/Text.kt
diff --git a/...spressoserver/lib/handlers/TouchAction.kt → ...spressoserver/lib/handlers/TouchAction.kt b/...spressoserver/lib/handlers/TouchAction.kt → ...spressoserver/lib/handlers/TouchAction.kt
diff --git a/...rver/lib/handlers/UIThreadSynchronizer.kt → ...rver/lib/handlers/UIThreadSynchronizer.kt b/...rver/lib/handlers/UIThreadSynchronizer.kt → ...rver/lib/handlers/UIThreadSynchronizer.kt
diff --git a/...spressoserver/lib/handlers/Uiautomator.kt → ...spressoserver/lib/handlers/Uiautomator.kt b/...spressoserver/lib/handlers/Uiautomator.kt → ...spressoserver/lib/handlers/Uiautomator.kt
diff --git a/...ver/lib/handlers/UiautomatorPageSource.kt → ...ver/lib/handlers/UiautomatorPageSource.kt b/...ver/lib/handlers/UiautomatorPageSource.kt → ...ver/lib/handlers/UiautomatorPageSource.kt
diff --git a/...lib/handlers/UnregisterIdlingResources.kt → ...lib/handlers/UnregisterIdlingResources.kt b/...lib/handlers/UnregisterIdlingResources.kt → ...lib/handlers/UnregisterIdlingResources.kt
diff --git a/...essoserver/lib/handlers/UpdateSettings.kt → ...essoserver/lib/handlers/UpdateSettings.kt b/...essoserver/lib/handlers/UpdateSettings.kt → ...essoserver/lib/handlers/UpdateSettings.kt
diff --git a/...m/espressoserver/lib/handlers/WebAtoms.kt → ...m/espressoserver/lib/handlers/WebAtoms.kt b/...m/espressoserver/lib/handlers/WebAtoms.kt → ...m/espressoserver/lib/handlers/WebAtoms.kt
diff --git a/...ib/handlers/exceptions/AppiumException.kt → ...ib/handlers/exceptions/AppiumException.kt b/...ib/handlers/exceptions/AppiumException.kt → ...ib/handlers/exceptions/AppiumException.kt
diff --git a/...ers/exceptions/DuplicateRouteException.kt → ...ers/exceptions/DuplicateRouteException.kt b/...ers/exceptions/DuplicateRouteException.kt → ...ers/exceptions/DuplicateRouteException.kt
diff --git a/.../exceptions/ElementNotVisibleException.kt → .../exceptions/ElementNotVisibleException.kt b/.../exceptions/ElementNotVisibleException.kt → .../exceptions/ElementNotVisibleException.kt
diff --git a/...rs/exceptions/InvalidArgumentException.kt → ...rs/exceptions/InvalidArgumentException.kt b/...rs/exceptions/InvalidArgumentException.kt → ...rs/exceptions/InvalidArgumentException.kt
diff --git a/...xceptions/InvalidElementStateException.kt → ...xceptions/InvalidElementStateException.kt b/...xceptions/InvalidElementStateException.kt → ...xceptions/InvalidElementStateException.kt
diff --git a/...rs/exceptions/InvalidSelectorException.kt → ...rs/exceptions/InvalidSelectorException.kt b/...rs/exceptions/InvalidSelectorException.kt → ...rs/exceptions/InvalidSelectorException.kt
diff --git a/...eptions/MoveTargetOutOfBoundsException.kt → ...eptions/MoveTargetOutOfBoundsException.kt b/...eptions/MoveTargetOutOfBoundsException.kt → ...eptions/MoveTargetOutOfBoundsException.kt
diff --git a/...ndlers/exceptions/NoAlertOpenException.kt → ...ndlers/exceptions/NoAlertOpenException.kt b/...ndlers/exceptions/NoAlertOpenException.kt → ...ndlers/exceptions/NoAlertOpenException.kt
diff --git a/...dlers/exceptions/NoSuchDriverException.kt → ...dlers/exceptions/NoSuchDriverException.kt b/...dlers/exceptions/NoSuchDriverException.kt → ...dlers/exceptions/NoSuchDriverException.kt
diff --git a/...lers/exceptions/NoSuchElementException.kt → ...lers/exceptions/NoSuchElementException.kt b/...lers/exceptions/NoSuchElementException.kt → ...lers/exceptions/NoSuchElementException.kt
diff --git a/.../exceptions/NotYetImplementedException.kt → .../exceptions/NotYetImplementedException.kt b/.../exceptions/NotYetImplementedException.kt → .../exceptions/NotYetImplementedException.kt
diff --git a/...lers/exceptions/ScreenCaptureException.kt → ...lers/exceptions/ScreenCaptureException.kt b/...lers/exceptions/ScreenCaptureException.kt → ...lers/exceptions/ScreenCaptureException.kt
diff --git a/.../exceptions/SessionNotCreatedException.kt → .../exceptions/SessionNotCreatedException.kt b/.../exceptions/SessionNotCreatedException.kt → .../exceptions/SessionNotCreatedException.kt
diff --git a/...dlers/exceptions/StaleElementException.kt → ...dlers/exceptions/StaleElementException.kt b/...dlers/exceptions/StaleElementException.kt → ...dlers/exceptions/StaleElementException.kt
diff --git a/...ndlers/exceptions/XPathLookupException.kt → ...ndlers/exceptions/XPathLookupException.kt b/...ndlers/exceptions/XPathLookupException.kt → ...ndlers/exceptions/XPathLookupException.kt
diff --git a/.../lib/helpers/AccessibilityServiceState.kt → .../lib/helpers/AccessibilityServiceState.kt b/.../lib/helpers/AccessibilityServiceState.kt → .../lib/helpers/AccessibilityServiceState.kt
diff --git a/...essoserver/lib/helpers/ActivityHelpers.kt → ...essoserver/lib/helpers/ActivityHelpers.kt b/...essoserver/lib/helpers/ActivityHelpers.kt → ...essoserver/lib/helpers/ActivityHelpers.kt
diff --git a/...ver/lib/helpers/ActivityOptionsHelpers.kt → ...ver/lib/helpers/ActivityOptionsHelpers.kt b/...ver/lib/helpers/ActivityOptionsHelpers.kt → ...ver/lib/helpers/ActivityOptionsHelpers.kt
diff --git a/...spressoserver/lib/helpers/AlertHelpers.kt → ...spressoserver/lib/helpers/AlertHelpers.kt b/...spressoserver/lib/helpers/AlertHelpers.kt → ...spressoserver/lib/helpers/AlertHelpers.kt
diff --git a/...pressoserver/lib/helpers/AndroidLogger.kt → ...pressoserver/lib/helpers/AndroidLogger.kt b/...pressoserver/lib/helpers/AndroidLogger.kt → ...pressoserver/lib/helpers/AndroidLogger.kt
diff --git a/...pressoserver/lib/helpers/AssertHelpers.kt → ...pressoserver/lib/helpers/AssertHelpers.kt b/...pressoserver/lib/helpers/AssertHelpers.kt → ...pressoserver/lib/helpers/AssertHelpers.kt
diff --git a/...essoserver/lib/helpers/AutofillHelpers.kt → ...essoserver/lib/helpers/AutofillHelpers.kt b/...essoserver/lib/helpers/AutofillHelpers.kt → ...essoserver/lib/helpers/AutofillHelpers.kt
diff --git a/...essoserver/lib/helpers/BackdoorUtils.java → ...essoserver/lib/helpers/BackdoorUtils.java b/...essoserver/lib/helpers/BackdoorUtils.java → ...essoserver/lib/helpers/BackdoorUtils.java
diff --git a/...essoserver/lib/helpers/ClipboardHelper.kt → ...essoserver/lib/helpers/ClipboardHelper.kt b/...essoserver/lib/helpers/ClipboardHelper.kt → ...essoserver/lib/helpers/ClipboardHelper.kt
diff --git a/...soserver/lib/helpers/ComposeNodeFinder.kt → ...soserver/lib/helpers/ComposeNodeFinder.kt b/...soserver/lib/helpers/ComposeNodeFinder.kt → ...soserver/lib/helpers/ComposeNodeFinder.kt
@@ -18,7 +18,6 @@ package io.appium.espressoserver.lib.helpers
 
 import androidx.compose.ui.semantics.SemanticsNode
 import androidx.compose.ui.test.*
-import io.appium.espressoserver.EspressoServerRunnerTest
 import io.appium.espressoserver.lib.drivers.DriverContext
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidSelectorException
 import io.appium.espressoserver.lib.model.Strategy

diff --git a/...erver/lib/helpers/CustomFailureHandler.kt → ...erver/lib/helpers/CustomFailureHandler.kt b/...erver/lib/helpers/CustomFailureHandler.kt → ...erver/lib/helpers/CustomFailureHandler.kt
diff --git a/...ssoserver/lib/helpers/DeviceInfoHelper.kt → ...ssoserver/lib/helpers/DeviceInfoHelper.kt b/...ssoserver/lib/helpers/DeviceInfoHelper.kt → ...ssoserver/lib/helpers/DeviceInfoHelper.kt
diff --git a/...oserver/lib/helpers/EspressoViewsCache.kt → ...oserver/lib/helpers/EspressoViewsCache.kt b/...oserver/lib/helpers/EspressoViewsCache.kt → ...oserver/lib/helpers/EspressoViewsCache.kt
diff --git a/...soserver/lib/helpers/GsonParserHelpers.kt → ...soserver/lib/helpers/GsonParserHelpers.kt b/...soserver/lib/helpers/GsonParserHelpers.kt → ...soserver/lib/helpers/GsonParserHelpers.kt
diff --git a/.../espressoserver/lib/helpers/IMEHelpers.kt → .../espressoserver/lib/helpers/IMEHelpers.kt b/.../espressoserver/lib/helpers/IMEHelpers.kt → .../espressoserver/lib/helpers/IMEHelpers.kt
diff --git a/...pressoserver/lib/helpers/IntentHelpers.kt → ...pressoserver/lib/helpers/IntentHelpers.kt b/...pressoserver/lib/helpers/IntentHelpers.kt → ...pressoserver/lib/helpers/IntentHelpers.kt
diff --git a/...soserver/lib/helpers/InteractionHelper.kt → ...soserver/lib/helpers/InteractionHelper.kt b/...soserver/lib/helpers/InteractionHelper.kt → ...soserver/lib/helpers/InteractionHelper.kt
diff --git a/...rver/lib/helpers/InvocationOperation.java → ...rver/lib/helpers/InvocationOperation.java b/...rver/lib/helpers/InvocationOperation.java → ...rver/lib/helpers/InvocationOperation.java
diff --git a/...pressoserver/lib/helpers/LocaleHelpers.kt → ...pressoserver/lib/helpers/LocaleHelpers.kt b/...pressoserver/lib/helpers/LocaleHelpers.kt → ...pressoserver/lib/helpers/LocaleHelpers.kt
diff --git a/...pium/espressoserver/lib/helpers/Logger.kt → ...pium/espressoserver/lib/helpers/Logger.kt b/...pium/espressoserver/lib/helpers/Logger.kt → ...pium/espressoserver/lib/helpers/Logger.kt
diff --git a/...erver/lib/helpers/NotificationListener.kt → ...erver/lib/helpers/NotificationListener.kt b/...erver/lib/helpers/NotificationListener.kt → ...erver/lib/helpers/NotificationListener.kt
diff --git a/...appium/espressoserver/lib/helpers/Rect.kt → ...appium/espressoserver/lib/helpers/Rect.kt b/...appium/espressoserver/lib/helpers/Rect.kt → ...appium/espressoserver/lib/helpers/Rect.kt
diff --git a/...essoserver/lib/helpers/ReflectionUtils.kt → ...essoserver/lib/helpers/ReflectionUtils.kt b/...essoserver/lib/helpers/ReflectionUtils.kt → ...essoserver/lib/helpers/ReflectionUtils.kt
diff --git a/...soserver/lib/helpers/ScreenshotHelpers.kt → ...soserver/lib/helpers/ScreenshotHelpers.kt b/...soserver/lib/helpers/ScreenshotHelpers.kt → ...soserver/lib/helpers/ScreenshotHelpers.kt
diff --git a/...espressoserver/lib/helpers/SizeHelpers.kt → ...espressoserver/lib/helpers/SizeHelpers.kt b/...espressoserver/lib/helpers/SizeHelpers.kt → ...espressoserver/lib/helpers/SizeHelpers.kt
diff --git a/...pressoserver/lib/helpers/StringHelpers.kt → ...pressoserver/lib/helpers/StringHelpers.kt b/...pressoserver/lib/helpers/StringHelpers.kt → ...pressoserver/lib/helpers/StringHelpers.kt
diff --git a/...pressoserver/lib/helpers/ThreadHelpers.kt → ...pressoserver/lib/helpers/ThreadHelpers.kt b/...pressoserver/lib/helpers/ThreadHelpers.kt → ...pressoserver/lib/helpers/ThreadHelpers.kt
diff --git a/...server/lib/helpers/UiAutomationWrapper.kt → ...server/lib/helpers/UiAutomationWrapper.kt b/...server/lib/helpers/UiAutomationWrapper.kt → ...server/lib/helpers/UiAutomationWrapper.kt
diff --git a/.../espressoserver/lib/helpers/ViewFinder.kt → .../espressoserver/lib/helpers/ViewFinder.kt b/.../espressoserver/lib/helpers/ViewFinder.kt → .../espressoserver/lib/helpers/ViewFinder.kt
diff --git a/.../espressoserver/lib/helpers/XMLHelpers.kt → .../espressoserver/lib/helpers/XMLHelpers.kt b/.../espressoserver/lib/helpers/XMLHelpers.kt → .../espressoserver/lib/helpers/XMLHelpers.kt
diff --git a/...erver/lib/helpers/extensions/Semaphore.kt → ...erver/lib/helpers/extensions/Semaphore.kt b/...erver/lib/helpers/extensions/Semaphore.kt → ...erver/lib/helpers/extensions/Semaphore.kt
diff --git a/...er/lib/helpers/reflection/ArrayUtils.java → ...er/lib/helpers/reflection/ArrayUtils.java b/...er/lib/helpers/reflection/ArrayUtils.java → ...er/lib/helpers/reflection/ArrayUtils.java
diff --git a/...er/lib/helpers/reflection/ClassUtils.java → ...er/lib/helpers/reflection/ClassUtils.java b/...er/lib/helpers/reflection/ClassUtils.java → ...er/lib/helpers/reflection/ClassUtils.java
diff --git a/...r/lib/helpers/reflection/MethodUtils.java → ...r/lib/helpers/reflection/MethodUtils.java b/...r/lib/helpers/reflection/MethodUtils.java → ...r/lib/helpers/reflection/MethodUtils.java
diff --git a/...rver/lib/helpers/reflection/Validate.java → ...rver/lib/helpers/reflection/Validate.java b/...rver/lib/helpers/reflection/Validate.java → ...rver/lib/helpers/reflection/Validate.java
diff --git a/...lpers/w3c/adapter/BaseW3CActionAdapter.kt → ...lpers/w3c/adapter/BaseW3CActionAdapter.kt b/...lpers/w3c/adapter/BaseW3CActionAdapter.kt → ...lpers/w3c/adapter/BaseW3CActionAdapter.kt
diff --git a/...pers/w3c/adapter/DummyW3CActionAdapter.kt → ...pers/w3c/adapter/DummyW3CActionAdapter.kt b/...pers/w3c/adapter/DummyW3CActionAdapter.kt → ...pers/w3c/adapter/DummyW3CActionAdapter.kt
diff --git a/...b/helpers/w3c/adapter/W3CActionAdapter.kt → ...b/helpers/w3c/adapter/W3CActionAdapter.kt b/...b/helpers/w3c/adapter/W3CActionAdapter.kt → ...b/helpers/w3c/adapter/W3CActionAdapter.kt
diff --git a/...s/w3c/adapter/espresso/AndroidKeyEvent.kt → ...s/w3c/adapter/espresso/AndroidKeyEvent.kt b/...s/w3c/adapter/espresso/AndroidKeyEvent.kt → ...s/w3c/adapter/espresso/AndroidKeyEvent.kt
diff --git a/...3c/adapter/espresso/AndroidMotionEvent.kt → ...3c/adapter/espresso/AndroidMotionEvent.kt b/...3c/adapter/espresso/AndroidMotionEvent.kt → ...3c/adapter/espresso/AndroidMotionEvent.kt
diff --git a/...pter/espresso/EspressoW3CActionAdapter.kt → ...pter/espresso/EspressoW3CActionAdapter.kt b/...pter/espresso/EspressoW3CActionAdapter.kt → ...pter/espresso/EspressoW3CActionAdapter.kt
diff --git a/...b/helpers/w3c/adapter/espresso/Helpers.kt → ...b/helpers/w3c/adapter/espresso/Helpers.kt b/...b/helpers/w3c/adapter/espresso/Helpers.kt → ...b/helpers/w3c/adapter/espresso/Helpers.kt
diff --git a/...3c/adapter/espresso/MotionEventBuilder.kt → ...3c/adapter/espresso/MotionEventBuilder.kt b/...3c/adapter/espresso/MotionEventBuilder.kt → ...3c/adapter/espresso/MotionEventBuilder.kt
diff --git a/...s/w3c/adapter/espresso/MultiTouchState.kt → ...s/w3c/adapter/espresso/MultiTouchState.kt b/...s/w3c/adapter/espresso/MultiTouchState.kt → ...s/w3c/adapter/espresso/MultiTouchState.kt
diff --git a/...elpers/w3c/adapter/espresso/TouchState.kt → ...elpers/w3c/adapter/espresso/TouchState.kt b/...elpers/w3c/adapter/espresso/TouchState.kt → ...elpers/w3c/adapter/espresso/TouchState.kt
diff --git a/...oserver/lib/helpers/w3c/caps/CapsUtils.kt → ...oserver/lib/helpers/w3c/caps/CapsUtils.kt b/...oserver/lib/helpers/w3c/caps/CapsUtils.kt → ...oserver/lib/helpers/w3c/caps/CapsUtils.kt
diff --git a/...pers/w3c/dispatcher/BaseDispatchResult.kt → ...pers/w3c/dispatcher/BaseDispatchResult.kt b/...pers/w3c/dispatcher/BaseDispatchResult.kt → ...pers/w3c/dispatcher/BaseDispatchResult.kt
diff --git a/...c/dispatcher/DispatchPointerMoveResult.kt → ...c/dispatcher/DispatchPointerMoveResult.kt b/...c/dispatcher/DispatchPointerMoveResult.kt → ...c/dispatcher/DispatchPointerMoveResult.kt
diff --git a/...lib/helpers/w3c/dispatcher/KeyDispatch.kt → ...lib/helpers/w3c/dispatcher/KeyDispatch.kt b/...lib/helpers/w3c/dispatcher/KeyDispatch.kt → ...lib/helpers/w3c/dispatcher/KeyDispatch.kt
diff --git a/...helpers/w3c/dispatcher/PointerDispatch.kt → ...helpers/w3c/dispatcher/PointerDispatch.kt b/...helpers/w3c/dispatcher/PointerDispatch.kt → ...helpers/w3c/dispatcher/PointerDispatch.kt
diff --git a/...lib/helpers/w3c/dispatcher/W3CKeyEvent.kt → ...lib/helpers/w3c/dispatcher/W3CKeyEvent.kt b/...lib/helpers/w3c/dispatcher/W3CKeyEvent.kt → ...lib/helpers/w3c/dispatcher/W3CKeyEvent.kt
diff --git a/...w3c/dispatcher/constants/KeyCodeMapper.kt → ...w3c/dispatcher/constants/KeyCodeMapper.kt b/...w3c/dispatcher/constants/KeyCodeMapper.kt → ...w3c/dispatcher/constants/KeyCodeMapper.kt
diff --git a/...dispatcher/constants/KeyLocationMapper.kt → ...dispatcher/constants/KeyLocationMapper.kt b/...dispatcher/constants/KeyLocationMapper.kt → ...dispatcher/constants/KeyLocationMapper.kt
diff --git a/...w3c/dispatcher/constants/KeyNormalizer.kt → ...w3c/dispatcher/constants/KeyNormalizer.kt b/...w3c/dispatcher/constants/KeyNormalizer.kt → ...w3c/dispatcher/constants/KeyNormalizer.kt
diff --git a/...3c/dispatcher/constants/NormalizedKeys.kt → ...3c/dispatcher/constants/NormalizedKeys.kt b/...3c/dispatcher/constants/NormalizedKeys.kt → ...3c/dispatcher/constants/NormalizedKeys.kt
diff --git a/...er/lib/helpers/w3c/models/ActionObject.kt → ...er/lib/helpers/w3c/models/ActionObject.kt b/...er/lib/helpers/w3c/models/ActionObject.kt → ...er/lib/helpers/w3c/models/ActionObject.kt
diff --git a/.../lib/helpers/w3c/models/ActionSequence.kt → .../lib/helpers/w3c/models/ActionSequence.kt b/.../lib/helpers/w3c/models/ActionSequence.kt → .../lib/helpers/w3c/models/ActionSequence.kt
diff --git a/...oserver/lib/helpers/w3c/models/Actions.kt → ...oserver/lib/helpers/w3c/models/Actions.kt b/...oserver/lib/helpers/w3c/models/Actions.kt → ...oserver/lib/helpers/w3c/models/Actions.kt
diff --git a/...ver/lib/helpers/w3c/models/InputSource.kt → ...ver/lib/helpers/w3c/models/InputSource.kt b/...ver/lib/helpers/w3c/models/InputSource.kt → ...ver/lib/helpers/w3c/models/InputSource.kt
diff --git a/...soserver/lib/helpers/w3c/models/Origin.kt → ...soserver/lib/helpers/w3c/models/Origin.kt b/...soserver/lib/helpers/w3c/models/Origin.kt → ...soserver/lib/helpers/w3c/models/Origin.kt
diff --git a/.../helpers/w3c/models/OriginDeserializer.kt → .../helpers/w3c/models/OriginDeserializer.kt b/.../helpers/w3c/models/OriginDeserializer.kt → .../helpers/w3c/models/OriginDeserializer.kt
diff --git a/...essoserver/lib/helpers/w3c/models/Tick.kt → ...essoserver/lib/helpers/w3c/models/Tick.kt b/...essoserver/lib/helpers/w3c/models/Tick.kt → ...essoserver/lib/helpers/w3c/models/Tick.kt
diff --git a/...helpers/w3c/processor/ActionsProcessor.kt → ...helpers/w3c/processor/ActionsProcessor.kt b/...helpers/w3c/processor/ActionsProcessor.kt → ...helpers/w3c/processor/ActionsProcessor.kt
diff --git a/...lib/helpers/w3c/processor/KeyProcessor.kt → ...lib/helpers/w3c/processor/KeyProcessor.kt b/...lib/helpers/w3c/processor/KeyProcessor.kt → ...lib/helpers/w3c/processor/KeyProcessor.kt
diff --git a/...b/helpers/w3c/processor/PauseProcessor.kt → ...b/helpers/w3c/processor/PauseProcessor.kt b/...b/helpers/w3c/processor/PauseProcessor.kt → ...b/helpers/w3c/processor/PauseProcessor.kt
diff --git a/...helpers/w3c/processor/PointerProcessor.kt → ...helpers/w3c/processor/PointerProcessor.kt b/...helpers/w3c/processor/PointerProcessor.kt → ...helpers/w3c/processor/PointerProcessor.kt
diff --git a/...helpers/w3c/processor/ProcessorHelpers.kt → ...helpers/w3c/processor/ProcessorHelpers.kt b/...helpers/w3c/processor/ProcessorHelpers.kt → ...helpers/w3c/processor/ProcessorHelpers.kt
diff --git a/...b/helpers/w3c/state/ActiveInputSources.kt → ...b/helpers/w3c/state/ActiveInputSources.kt b/...b/helpers/w3c/state/ActiveInputSources.kt → ...b/helpers/w3c/state/ActiveInputSources.kt
diff --git a/...erver/lib/helpers/w3c/state/InputState.kt → ...erver/lib/helpers/w3c/state/InputState.kt b/...erver/lib/helpers/w3c/state/InputState.kt → ...erver/lib/helpers/w3c/state/InputState.kt
diff --git a/.../lib/helpers/w3c/state/InputStateTable.kt → .../lib/helpers/w3c/state/InputStateTable.kt b/.../lib/helpers/w3c/state/InputStateTable.kt → .../lib/helpers/w3c/state/InputStateTable.kt
diff --git a/...er/lib/helpers/w3c/state/KeyInputState.kt → ...er/lib/helpers/w3c/state/KeyInputState.kt b/...er/lib/helpers/w3c/state/KeyInputState.kt → ...er/lib/helpers/w3c/state/KeyInputState.kt
diff --git a/...ib/helpers/w3c/state/PointerInputState.kt → ...ib/helpers/w3c/state/PointerInputState.kt b/...ib/helpers/w3c/state/PointerInputState.kt → ...ib/helpers/w3c/state/PointerInputState.kt
diff --git a/...spressoserver/lib/http/RouteDefinition.kt → ...spressoserver/lib/http/RouteDefinition.kt b/...spressoserver/lib/http/RouteDefinition.kt → ...spressoserver/lib/http/RouteDefinition.kt
diff --git a/...ppium/espressoserver/lib/http/RouteMap.kt → ...ppium/espressoserver/lib/http/RouteMap.kt b/...ppium/espressoserver/lib/http/RouteMap.kt → ...ppium/espressoserver/lib/http/RouteMap.kt
diff --git a/.../appium/espressoserver/lib/http/Router.kt → .../appium/espressoserver/lib/http/Router.kt b/.../appium/espressoserver/lib/http/Router.kt → .../appium/espressoserver/lib/http/Router.kt
diff --git a/.../appium/espressoserver/lib/http/Server.kt → .../appium/espressoserver/lib/http/Server.kt b/.../appium/espressoserver/lib/http/Server.kt → .../appium/espressoserver/lib/http/Server.kt
diff --git a/...erver/lib/http/response/AppiumResponse.kt → ...erver/lib/http/response/AppiumResponse.kt b/...erver/lib/http/response/AppiumResponse.kt → ...erver/lib/http/response/AppiumResponse.kt
diff --git a/...oserver/lib/http/response/BaseResponse.kt → ...oserver/lib/http/response/BaseResponse.kt b/...oserver/lib/http/response/BaseResponse.kt → ...oserver/lib/http/response/BaseResponse.kt
diff --git a/...m/espressoserver/lib/model/AlertParams.kt → ...m/espressoserver/lib/model/AlertParams.kt b/...m/espressoserver/lib/model/AlertParams.kt → ...m/espressoserver/lib/model/AlertParams.kt
diff --git a/.../espressoserver/lib/model/AppiumParams.kt → .../espressoserver/lib/model/AppiumParams.kt b/.../espressoserver/lib/model/AppiumParams.kt → .../espressoserver/lib/model/AppiumParams.kt
diff --git a/...spressoserver/lib/model/AttributesEnum.kt → ...spressoserver/lib/model/AttributesEnum.kt b/...spressoserver/lib/model/AttributesEnum.kt → ...spressoserver/lib/model/AttributesEnum.kt
diff --git a/...essoserver/lib/model/BackdoorMethodArg.kt → ...essoserver/lib/model/BackdoorMethodArg.kt b/...essoserver/lib/model/BackdoorMethodArg.kt → ...essoserver/lib/model/BackdoorMethodArg.kt
diff --git a/...essoserver/lib/model/ClipboardDataType.kt → ...essoserver/lib/model/ClipboardDataType.kt b/...essoserver/lib/model/ClipboardDataType.kt → ...essoserver/lib/model/ClipboardDataType.kt
diff --git a/...ssoserver/lib/model/ComposeNodeElement.kt → ...ssoserver/lib/model/ComposeNodeElement.kt b/...ssoserver/lib/model/ComposeNodeElement.kt → ...ssoserver/lib/model/ComposeNodeElement.kt
diff --git a/...ssoserver/lib/model/DrawerActionParams.kt → ...ssoserver/lib/model/DrawerActionParams.kt b/...ssoserver/lib/model/DrawerActionParams.kt → ...ssoserver/lib/model/DrawerActionParams.kt
diff --git a/...ssoserver/lib/model/EditorActionParams.kt → ...ssoserver/lib/model/EditorActionParams.kt b/...ssoserver/lib/model/EditorActionParams.kt → ...ssoserver/lib/model/EditorActionParams.kt
diff --git a/...ppium/espressoserver/lib/model/Element.kt → ...ppium/espressoserver/lib/model/Element.kt b/...ppium/espressoserver/lib/model/Element.kt → ...ppium/espressoserver/lib/model/Element.kt
diff --git a/...ssoserver/lib/model/GetClipboardParams.kt → ...ssoserver/lib/model/GetClipboardParams.kt b/...ssoserver/lib/model/GetClipboardParams.kt → ...ssoserver/lib/model/GetClipboardParams.kt
diff --git a/...espressoserver/lib/model/GlobalSession.kt → ...espressoserver/lib/model/GlobalSession.kt b/...espressoserver/lib/model/GlobalSession.kt → ...espressoserver/lib/model/GlobalSession.kt
diff --git a/...pressoserver/lib/model/HamcrestMatcher.kt → ...pressoserver/lib/model/HamcrestMatcher.kt b/...pressoserver/lib/model/HamcrestMatcher.kt → ...pressoserver/lib/model/HamcrestMatcher.kt
diff --git a/...server/lib/model/IdlingResourcesParams.kt → ...server/lib/model/IdlingResourcesParams.kt b/...server/lib/model/IdlingResourcesParams.kt → ...server/lib/model/IdlingResourcesParams.kt
diff --git a/...spressoserver/lib/model/KeyEventParams.kt → ...spressoserver/lib/model/KeyEventParams.kt b/...spressoserver/lib/model/KeyEventParams.kt → ...spressoserver/lib/model/KeyEventParams.kt
diff --git a/.../espressoserver/lib/model/LocaleParams.kt → .../espressoserver/lib/model/LocaleParams.kt b/.../espressoserver/lib/model/LocaleParams.kt → .../espressoserver/lib/model/LocaleParams.kt
diff --git a/...pium/espressoserver/lib/model/Location.kt → ...pium/espressoserver/lib/model/Location.kt b/...pium/espressoserver/lib/model/Location.kt → ...pium/espressoserver/lib/model/Location.kt
diff --git a/...ppium/espressoserver/lib/model/Locator.kt → ...ppium/espressoserver/lib/model/Locator.kt b/...ppium/espressoserver/lib/model/Locator.kt → ...ppium/espressoserver/lib/model/Locator.kt
diff --git a/...m/espressoserver/lib/model/MatcherJson.kt → ...m/espressoserver/lib/model/MatcherJson.kt b/...m/espressoserver/lib/model/MatcherJson.kt → ...m/espressoserver/lib/model/MatcherJson.kt
diff --git a/...oserver/lib/model/MobileBackdoorMethod.kt → ...oserver/lib/model/MobileBackdoorMethod.kt b/...oserver/lib/model/MobileBackdoorMethod.kt → ...oserver/lib/model/MobileBackdoorMethod.kt
diff --git a/...oserver/lib/model/MobileBackdoorParams.kt → ...oserver/lib/model/MobileBackdoorParams.kt b/...oserver/lib/model/MobileBackdoorParams.kt → ...oserver/lib/model/MobileBackdoorParams.kt
diff --git a/...rver/lib/model/MobileClickActionParams.kt → ...rver/lib/model/MobileClickActionParams.kt b/...rver/lib/model/MobileClickActionParams.kt → ...rver/lib/model/MobileClickActionParams.kt
diff --git a/...essoserver/lib/model/MobileSwipeParams.kt → ...essoserver/lib/model/MobileSwipeParams.kt b/...essoserver/lib/model/MobileSwipeParams.kt → ...essoserver/lib/model/MobileSwipeParams.kt
diff --git a/...essoserver/lib/model/MotionEventParams.kt → ...essoserver/lib/model/MotionEventParams.kt b/...essoserver/lib/model/MotionEventParams.kt → ...essoserver/lib/model/MotionEventParams.kt
diff --git a/.../espressoserver/lib/model/MoveToParams.kt → .../espressoserver/lib/model/MoveToParams.kt b/.../espressoserver/lib/model/MoveToParams.kt → .../espressoserver/lib/model/MoveToParams.kt
diff --git a/...rver/lib/model/MultiTouchActionsParams.kt → ...rver/lib/model/MultiTouchActionsParams.kt b/...rver/lib/model/MultiTouchActionsParams.kt → ...rver/lib/model/MultiTouchActionsParams.kt
diff --git a/...ressoserver/lib/model/NavigateToParams.kt → ...ressoserver/lib/model/NavigateToParams.kt b/...ressoserver/lib/model/NavigateToParams.kt → ...ressoserver/lib/model/NavigateToParams.kt
diff --git a/...essoserver/lib/model/OrientationParams.kt → ...essoserver/lib/model/OrientationParams.kt b/...essoserver/lib/model/OrientationParams.kt → ...essoserver/lib/model/OrientationParams.kt
diff --git a/...pressoserver/lib/model/OrientationType.kt → ...pressoserver/lib/model/OrientationType.kt b/...pressoserver/lib/model/OrientationType.kt → ...pressoserver/lib/model/OrientationType.kt
diff --git a/...o/appium/espressoserver/lib/model/Rect.kt → ...o/appium/espressoserver/lib/model/Rect.kt b/...o/appium/espressoserver/lib/model/Rect.kt → ...o/appium/espressoserver/lib/model/Rect.kt
diff --git a/...spressoserver/lib/model/RotationParams.kt → ...spressoserver/lib/model/RotationParams.kt b/...spressoserver/lib/model/RotationParams.kt → ...spressoserver/lib/model/RotationParams.kt
diff --git a/...ssoserver/lib/model/ScrollToPageParams.kt → ...ssoserver/lib/model/ScrollToPageParams.kt b/...ssoserver/lib/model/ScrollToPageParams.kt → ...ssoserver/lib/model/ScrollToPageParams.kt
diff --git a/...espressoserver/lib/model/SessionParams.kt → ...espressoserver/lib/model/SessionParams.kt b/...espressoserver/lib/model/SessionParams.kt → ...espressoserver/lib/model/SessionParams.kt
diff --git a/...ssoserver/lib/model/SetClipboardParams.kt → ...ssoserver/lib/model/SetClipboardParams.kt b/...ssoserver/lib/model/SetClipboardParams.kt → ...ssoserver/lib/model/SetClipboardParams.kt
diff --git a/...espressoserver/lib/model/SetDateParams.kt → ...espressoserver/lib/model/SetDateParams.kt b/...espressoserver/lib/model/SetDateParams.kt → ...espressoserver/lib/model/SetDateParams.kt
diff --git a/...espressoserver/lib/model/SetTimeParams.kt → ...espressoserver/lib/model/SetTimeParams.kt b/...espressoserver/lib/model/SetTimeParams.kt → ...espressoserver/lib/model/SetTimeParams.kt
diff --git a/...spressoserver/lib/model/SettingsParams.kt → ...spressoserver/lib/model/SettingsParams.kt b/...spressoserver/lib/model/SettingsParams.kt → ...spressoserver/lib/model/SettingsParams.kt
diff --git a/...o/appium/espressoserver/lib/model/Size.kt → ...o/appium/espressoserver/lib/model/Size.kt b/...o/appium/espressoserver/lib/model/Size.kt → ...o/appium/espressoserver/lib/model/Size.kt
diff --git a/...spressoserver/lib/model/SourceDocument.kt → ...spressoserver/lib/model/SourceDocument.kt b/...spressoserver/lib/model/SourceDocument.kt → ...spressoserver/lib/model/SourceDocument.kt
diff --git a/...soserver/lib/model/StartActivityParams.kt → ...soserver/lib/model/StartActivityParams.kt b/...soserver/lib/model/StartActivityParams.kt → ...soserver/lib/model/StartActivityParams.kt
diff --git a/...ssoserver/lib/model/StartServiceParams.kt → ...ssoserver/lib/model/StartServiceParams.kt b/...ssoserver/lib/model/StartServiceParams.kt → ...ssoserver/lib/model/StartServiceParams.kt
diff --git a/...essoserver/lib/model/StopServiceParams.kt → ...essoserver/lib/model/StopServiceParams.kt b/...essoserver/lib/model/StopServiceParams.kt → ...essoserver/lib/model/StopServiceParams.kt
diff --git a/...pium/espressoserver/lib/model/Strategy.kt → ...pium/espressoserver/lib/model/Strategy.kt b/...pium/espressoserver/lib/model/Strategy.kt → ...pium/espressoserver/lib/model/Strategy.kt
diff --git a/...pressoserver/lib/model/TextValueParams.kt → ...pressoserver/lib/model/TextValueParams.kt b/...pressoserver/lib/model/TextValueParams.kt → ...pressoserver/lib/model/TextValueParams.kt
diff --git a/...essoserver/lib/model/ToastLookupParams.kt → ...essoserver/lib/model/ToastLookupParams.kt b/...essoserver/lib/model/ToastLookupParams.kt → ...essoserver/lib/model/ToastLookupParams.kt
diff --git a/...m/espressoserver/lib/model/TouchAction.kt → ...m/espressoserver/lib/model/TouchAction.kt b/...m/espressoserver/lib/model/TouchAction.kt → ...m/espressoserver/lib/model/TouchAction.kt
diff --git a/...ssoserver/lib/model/TouchActionsParams.kt → ...ssoserver/lib/model/TouchActionsParams.kt b/...ssoserver/lib/model/TouchActionsParams.kt → ...ssoserver/lib/model/TouchActionsParams.kt
diff --git a/...essoserver/lib/model/UiautomatorParams.kt → ...essoserver/lib/model/UiautomatorParams.kt b/...essoserver/lib/model/UiautomatorParams.kt → ...essoserver/lib/model/UiautomatorParams.kt
diff --git a/...m/espressoserver/lib/model/ViewElement.kt → ...m/espressoserver/lib/model/ViewElement.kt b/...m/espressoserver/lib/model/ViewElement.kt → ...m/espressoserver/lib/model/ViewElement.kt
diff --git a/...pressoserver/lib/model/ViewFlashParams.kt → ...pressoserver/lib/model/ViewFlashParams.kt b/...pressoserver/lib/model/ViewFlashParams.kt → ...pressoserver/lib/model/ViewFlashParams.kt
diff --git a/...pium/espressoserver/lib/model/ViewText.kt → ...pium/espressoserver/lib/model/ViewText.kt b/...pium/espressoserver/lib/model/ViewText.kt → ...pium/espressoserver/lib/model/ViewText.kt
diff --git a/...um/espressoserver/lib/model/WindowRect.kt → ...um/espressoserver/lib/model/WindowRect.kt b/...um/espressoserver/lib/model/WindowRect.kt → ...um/espressoserver/lib/model/WindowRect.kt
diff --git a/...um/espressoserver/lib/model/WindowSize.kt → ...um/espressoserver/lib/model/WindowSize.kt b/...um/espressoserver/lib/model/WindowSize.kt → ...um/espressoserver/lib/model/WindowSize.kt
diff --git a/...ver/lib/model/settings/AbstractSetting.kt → ...ver/lib/model/settings/AbstractSetting.kt b/...ver/lib/model/settings/AbstractSetting.kt → ...ver/lib/model/settings/AbstractSetting.kt
diff --git a/...erver/lib/model/settings/DriverSetting.kt → ...erver/lib/model/settings/DriverSetting.kt b/...erver/lib/model/settings/DriverSetting.kt → ...erver/lib/model/settings/DriverSetting.kt
diff --git a/...oserver/lib/model/settings/SettingType.kt → ...oserver/lib/model/settings/SettingType.kt b/...oserver/lib/model/settings/SettingType.kt → ...oserver/lib/model/settings/SettingType.kt
diff --git a/...m/espressoserver/lib/model/web/WebAtom.kt → ...m/espressoserver/lib/model/web/WebAtom.kt b/...m/espressoserver/lib/model/web/WebAtom.kt → ...m/espressoserver/lib/model/web/WebAtom.kt
diff --git a/...rver/lib/model/web/WebAtomDeserializer.kt → ...rver/lib/model/web/WebAtomDeserializer.kt b/...rver/lib/model/web/WebAtomDeserializer.kt → ...rver/lib/model/web/WebAtomDeserializer.kt
diff --git a/...soserver/lib/model/web/WebAtomsMethods.kt → ...soserver/lib/model/web/WebAtomsMethods.kt b/...soserver/lib/model/web/WebAtomsMethods.kt → ...soserver/lib/model/web/WebAtomsMethods.kt
diff --git a/...ssoserver/lib/model/web/WebAtomsParams.kt → ...ssoserver/lib/model/web/WebAtomsParams.kt b/...ssoserver/lib/model/web/WebAtomsParams.kt → ...ssoserver/lib/model/web/WebAtomsParams.kt
diff --git a/...erver/lib/viewaction/OrientationChange.kt → ...erver/lib/viewaction/OrientationChange.kt b/...erver/lib/viewaction/OrientationChange.kt → ...erver/lib/viewaction/OrientationChange.kt
diff --git a/...espressoserver/lib/viewaction/ScrollTo.kt → ...espressoserver/lib/viewaction/ScrollTo.kt b/...espressoserver/lib/viewaction/ScrollTo.kt → ...espressoserver/lib/viewaction/ScrollTo.kt
diff --git a/...r/lib/viewaction/UiControllerPerformer.kt → ...r/lib/viewaction/UiControllerPerformer.kt b/...r/lib/viewaction/UiControllerPerformer.kt → ...r/lib/viewaction/UiControllerPerformer.kt
diff --git a/...er/lib/viewaction/UiControllerRunnable.kt → ...er/lib/viewaction/UiControllerRunnable.kt b/...er/lib/viewaction/UiControllerRunnable.kt → ...er/lib/viewaction/UiControllerRunnable.kt
diff --git a/...pressoserver/lib/viewaction/ViewGetter.kt → ...pressoserver/lib/viewaction/ViewGetter.kt b/...pressoserver/lib/viewaction/ViewGetter.kt → ...pressoserver/lib/viewaction/ViewGetter.kt
diff --git a/...soserver/lib/viewaction/ViewTextGetter.kt → ...soserver/lib/viewaction/ViewTextGetter.kt b/...soserver/lib/viewaction/ViewTextGetter.kt → ...soserver/lib/viewaction/ViewTextGetter.kt
diff --git a/...rver/lib/viewmatcher/RegexpTextMatcher.kt → ...rver/lib/viewmatcher/RegexpTextMatcher.kt b/...rver/lib/viewmatcher/RegexpTextMatcher.kt → ...rver/lib/viewmatcher/RegexpTextMatcher.kt
diff --git a/...spressoserver/lib/viewmatcher/WithView.kt → ...spressoserver/lib/viewmatcher/WithView.kt b/...spressoserver/lib/viewmatcher/WithView.kt → ...spressoserver/lib/viewmatcher/WithView.kt
diff --git a/...pressoserver/lib/viewmatcher/WithXPath.kt → ...pressoserver/lib/viewmatcher/WithXPath.kt b/...pressoserver/lib/viewmatcher/WithXPath.kt → ...pressoserver/lib/viewmatcher/WithXPath.kt
diff --git a/...ium/espressoserver/test/assets/Helpers.kt → ...ium/espressoserver/test/assets/Helpers.kt b/...ium/espressoserver/test/assets/Helpers.kt → ...ium/espressoserver/test/assets/Helpers.kt
diff --git a/...oserver/test/assets/backdoor-methods.json → ...oserver/test/assets/backdoor-methods.json b/...oserver/test/assets/backdoor-methods.json → ...oserver/test/assets/backdoor-methods.json
diff --git a/...pressoserver/test/assets/key-actions.json → ...pressoserver/test/assets/key-actions.json b/...pressoserver/test/assets/key-actions.json → ...pressoserver/test/assets/key-actions.json
diff --git a/...rver/test/assets/multi-touch-actions.json → ...rver/test/assets/multi-touch-actions.json b/...rver/test/assets/multi-touch-actions.json → ...rver/test/assets/multi-touch-actions.json
diff --git a/...ver/test/helpers/GsonParserHelpersTest.kt → ...ver/test/helpers/GsonParserHelpersTest.kt b/...ver/test/helpers/GsonParserHelpersTest.kt → ...ver/test/helpers/GsonParserHelpersTest.kt
diff --git a/...erver/test/helpers/IntentCreationTests.kt → ...erver/test/helpers/IntentCreationTests.kt b/...erver/test/helpers/IntentCreationTests.kt → ...erver/test/helpers/IntentCreationTests.kt
diff --git a/...test/helpers/InvocationOperationTest.java → ...test/helpers/InvocationOperationTest.java b/...test/helpers/InvocationOperationTest.java → ...test/helpers/InvocationOperationTest.java
diff --git a/...rver/test/helpers/KReflectionUtilsTest.kt → ...rver/test/helpers/KReflectionUtilsTest.kt b/...rver/test/helpers/KReflectionUtilsTest.kt → ...rver/test/helpers/KReflectionUtilsTest.kt
diff --git a/...ver/test/helpers/XpathQueryParserTests.kt → ...ver/test/helpers/XpathQueryParserTests.kt b/...ver/test/helpers/XpathQueryParserTests.kt → ...ver/test/helpers/XpathQueryParserTests.kt
diff --git a/...er/test/helpers/w3c/ActionSequenceTest.kt → ...er/test/helpers/w3c/ActionSequenceTest.kt b/...er/test/helpers/w3c/ActionSequenceTest.kt → ...er/test/helpers/w3c/ActionSequenceTest.kt
diff --git a/...ssoserver/test/helpers/w3c/ActionsTest.kt → ...ssoserver/test/helpers/w3c/ActionsTest.kt b/...ssoserver/test/helpers/w3c/ActionsTest.kt → ...ssoserver/test/helpers/w3c/ActionsTest.kt
diff --git a/...oserver/test/helpers/w3c/CapsUtilsTest.kt → ...oserver/test/helpers/w3c/CapsUtilsTest.kt b/...oserver/test/helpers/w3c/CapsUtilsTest.kt → ...oserver/test/helpers/w3c/CapsUtilsTest.kt
diff --git a/...spressoserver/test/helpers/w3c/Helpers.kt → ...spressoserver/test/helpers/w3c/Helpers.kt b/...spressoserver/test/helpers/w3c/Helpers.kt → ...spressoserver/test/helpers/w3c/Helpers.kt
diff --git a/...erver/test/helpers/w3c/InputSourceTest.kt → ...erver/test/helpers/w3c/InputSourceTest.kt b/...erver/test/helpers/w3c/InputSourceTest.kt → ...erver/test/helpers/w3c/InputSourceTest.kt
diff --git a/...r/test/helpers/w3c/InputStateTableTest.kt → ...r/test/helpers/w3c/InputStateTableTest.kt b/...r/test/helpers/w3c/InputStateTableTest.kt → ...r/test/helpers/w3c/InputStateTableTest.kt
diff --git a/...erver/test/helpers/w3c/KeyDispatchTest.kt → ...erver/test/helpers/w3c/KeyDispatchTest.kt b/...erver/test/helpers/w3c/KeyDispatchTest.kt → ...erver/test/helpers/w3c/KeyDispatchTest.kt
diff --git a/...ver/test/helpers/w3c/KeyInputStateTest.kt → ...ver/test/helpers/w3c/KeyInputStateTest.kt b/...ver/test/helpers/w3c/KeyInputStateTest.kt → ...ver/test/helpers/w3c/KeyInputStateTest.kt
diff --git a/...r/test/helpers/w3c/PointerDispatchTest.kt → ...r/test/helpers/w3c/PointerDispatchTest.kt b/...r/test/helpers/w3c/PointerDispatchTest.kt → ...r/test/helpers/w3c/PointerDispatchTest.kt
diff --git a/...oserver/test/helpers/w3c/ProcessorTest.kt → ...oserver/test/helpers/w3c/ProcessorTest.kt b/...oserver/test/helpers/w3c/ProcessorTest.kt → ...oserver/test/helpers/w3c/ProcessorTest.kt
diff --git a/...pressoserver/test/helpers/w3c/TickTest.kt → ...pressoserver/test/helpers/w3c/TickTest.kt b/...pressoserver/test/helpers/w3c/TickTest.kt → ...pressoserver/test/helpers/w3c/TickTest.kt
diff --git a/...elpers/w3c/adapter/AndroidKeyEventTest.kt → ...elpers/w3c/adapter/AndroidKeyEventTest.kt b/...elpers/w3c/adapter/AndroidKeyEventTest.kt → ...elpers/w3c/adapter/AndroidKeyEventTest.kt
diff --git a/...r/test/helpers/w3c/adapter/HelpersTest.kt → ...r/test/helpers/w3c/adapter/HelpersTest.kt b/...r/test/helpers/w3c/adapter/HelpersTest.kt → ...r/test/helpers/w3c/adapter/HelpersTest.kt
diff --git a/...soserver/test/http/RouteDefinitionTest.kt → ...soserver/test/http/RouteDefinitionTest.kt b/...soserver/test/http/RouteDefinitionTest.kt → ...soserver/test/http/RouteDefinitionTest.kt
diff --git a/...oserver/test/model/HamcrestMatcherTest.kt → ...oserver/test/model/HamcrestMatcherTest.kt b/...oserver/test/model/HamcrestMatcherTest.kt → ...oserver/test/model/HamcrestMatcherTest.kt
diff --git a/...ressoserver/test/model/MatcherJsonTest.kt → ...ressoserver/test/model/MatcherJsonTest.kt b/...ressoserver/test/model/MatcherJsonTest.kt → ...ressoserver/test/model/MatcherJsonTest.kt
diff --git a/.../test/model/MobileBackdoorMethodTest.java → .../test/model/MobileBackdoorMethodTest.java b/.../test/model/MobileBackdoorMethodTest.java → .../test/model/MobileBackdoorMethodTest.java
diff --git a/...ressoserver/test/model/MobileClickTest.kt → ...ressoserver/test/model/MobileClickTest.kt b/...ressoserver/test/model/MobileClickTest.kt → ...ressoserver/test/model/MobileClickTest.kt
diff --git a/...ressoserver/test/model/MobileSwipeTest.kt → ...ressoserver/test/model/MobileSwipeTest.kt b/...ressoserver/test/model/MobileSwipeTest.kt → ...ressoserver/test/model/MobileSwipeTest.kt
diff --git a/...ressoserver/test/model/TouchActionTest.kt → ...ressoserver/test/model/TouchActionTest.kt b/...ressoserver/test/model/TouchActionTest.kt → ...ressoserver/test/model/TouchActionTest.kt
diff --git a/...ressoserver/test/model/web/WebAtomTest.kt → ...ressoserver/test/model/web/WebAtomTest.kt b/...ressoserver/test/model/web/WebAtomTest.kt → ...ressoserver/test/model/web/WebAtomTest.kt
diff --git a/...essoserver/test/model/web/WebAtomsTest.kt → ...essoserver/test/model/web/WebAtomsTest.kt b/...essoserver/test/model/web/WebAtomsTest.kt → ...essoserver/test/model/web/WebAtomsTest.kt
diff --git a/espresso-server/settings.gradle.kts b/espresso-server/settings.gradle.kts
@@ -1 +1,2 @@
 include(":app")
+include(":library")
diff --git a/package.json b/package.json
@@ -58,6 +58,8 @@
     "espresso-server/app/build/outputs/apk",
     "espresso-server/app/build.gradle.kts",
     "espresso-server/app/proguard-rules.pro",
+    "espresso-server/library/src",
+    "espresso-server/library/build.gradle.kts",
     "espresso-server/gradle",
     "espresso-server/gradlew",
     "espresso-server/gradlew.bat",
@@ -86,9 +88,9 @@
     "build": "npm run build:node && npm run build:server",
     "rebuild": "npm run rebuild:node && npm run rebuild:server",
     "build:node": "tsc -b",
-    "build:server": "cd espresso-server && ./gradlew assembleAndroidTest || cd ..",
+    "build:server": "cd espresso-server && ./gradlew :app:assembleAndroidTest || cd ..",
     "rebuild:node": "npm run clean:node && npm run build:node",
-    "rebuild:server": "cd espresso-server && ./gradlew clean assembleAndroidTest || cd ..",
+    "rebuild:server": "cd espresso-server && ./gradlew clean :app:assembleAndroidTest || cd ..",
     "clean:node": "npm run build -- --clean",
     "clean:server": "cd espresso-server && ./gradlew clean || cd ..",
     "dev": "npm run build -- --watch",