appium-espresso-driver 2.44.2 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (283) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/README.md +1 -1
  3. package/build/lib/server-builder.js +1 -1
  4. package/build/lib/server-builder.js.map +1 -1
  5. package/espresso-server/app/build.gradle.kts +35 -126
  6. package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/EspressoServerRunnerTest.kt +3 -53
  7. package/espresso-server/build.gradle.kts +6 -9
  8. package/espresso-server/gradle.properties +22 -0
  9. package/espresso-server/library/build.gradle.kts +111 -0
  10. package/espresso-server/library/src/main/AndroidManifest.xml +6 -0
  11. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/drivers/DriverContext.kt +5 -1
  12. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/DeleteSession.kt +2 -2
  13. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetAttribute.kt +1 -2
  14. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/RequestHandler.kt +3 -3
  15. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ComposeNodeFinder.kt +2 -2
  16. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/Router.kt +2 -2
  17. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/Server.kt +32 -4
  18. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/SourceDocument.kt +5 -8
  19. package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/settings/DriverSetting.kt +2 -3
  20. package/espresso-server/settings.gradle.kts +1 -0
  21. package/lib/server-builder.js +1 -1
  22. package/npm-shrinkwrap.json +48 -264
  23. package/package.json +5 -3
  24. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/AcceptAlert.kt +0 -0
  25. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Back.kt +0 -0
  26. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Clear.kt +0 -0
  27. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Click.kt +0 -0
  28. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/CreateSession.kt +0 -0
  29. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/DismissAlert.kt +0 -0
  30. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/DrawerActionHandler.kt +0 -0
  31. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ElementEquals.kt +0 -0
  32. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ElementScreenshot.kt +0 -0
  33. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ElementValue.kt +0 -0
  34. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/FindActive.kt +0 -0
  35. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/FindElement.kt +0 -0
  36. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/FindElements.kt +0 -0
  37. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetAlertText.kt +0 -0
  38. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetClipboard.kt +0 -0
  39. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetDeviceInfo.kt +0 -0
  40. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetDisplayDensity.kt +0 -0
  41. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetDisplayed.kt +0 -0
  42. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetEnabled.kt +0 -0
  43. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetLocation.kt +0 -0
  44. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetLocationInView.kt +0 -0
  45. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetName.kt +0 -0
  46. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetOrientation.kt +0 -0
  47. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetRect.kt +0 -0
  48. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetRotation.kt +0 -0
  49. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetSelected.kt +0 -0
  50. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetSession.kt +0 -0
  51. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetSessions.kt +0 -0
  52. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetSettings.kt +0 -0
  53. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetSize.kt +0 -0
  54. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetToastVisibility.kt +0 -0
  55. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetWindowRect.kt +0 -0
  56. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetWindowSize.kt +0 -0
  57. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/HideKeyboard.kt +0 -0
  58. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Keys.kt +0 -0
  59. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ListIdlingResources.kt +0 -0
  60. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/MobileBackdoor.kt +0 -0
  61. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/MobileClickAction.kt +0 -0
  62. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/MobileSwipe.kt +0 -0
  63. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/MobileViewFlash.kt +0 -0
  64. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/MoveTo.kt +0 -0
  65. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/MultiTouchAction.kt +0 -0
  66. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/NavigateTo.kt +0 -0
  67. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/NoSessionCommandHandler.kt +0 -0
  68. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/NotYetImplemented.kt +0 -0
  69. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/OpenNotifications.kt +0 -0
  70. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/PerformAction.kt +0 -0
  71. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/PerformAutofillDismissal.kt +0 -0
  72. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/PerformEditorAction.kt +0 -0
  73. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/PointerEventHandler.kt +0 -0
  74. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/PressKeyCode.kt +0 -0
  75. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/RegisterIdlingResources.kt +0 -0
  76. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ReleaseActions.kt +0 -0
  77. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ScreenshotHandler.kt +0 -0
  78. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/ScrollToPage.kt +0 -0
  79. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/SetClipboard.kt +0 -0
  80. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/SetDate.kt +0 -0
  81. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/SetOrientation.kt +0 -0
  82. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/SetRotation.kt +0 -0
  83. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/SetTime.kt +0 -0
  84. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Source.kt +0 -0
  85. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/StartActivity.kt +0 -0
  86. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/StartService.kt +0 -0
  87. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Status.kt +0 -0
  88. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/StopService.kt +0 -0
  89. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Text.kt +0 -0
  90. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/TouchAction.kt +0 -0
  91. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/UIThreadSynchronizer.kt +0 -0
  92. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/Uiautomator.kt +0 -0
  93. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/UiautomatorPageSource.kt +0 -0
  94. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/UnregisterIdlingResources.kt +0 -0
  95. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/UpdateSettings.kt +0 -0
  96. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/WebAtoms.kt +0 -0
  97. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/AppiumException.kt +0 -0
  98. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/DuplicateRouteException.kt +0 -0
  99. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/ElementNotVisibleException.kt +0 -0
  100. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/InvalidArgumentException.kt +0 -0
  101. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/InvalidElementStateException.kt +0 -0
  102. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/InvalidSelectorException.kt +0 -0
  103. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/MoveTargetOutOfBoundsException.kt +0 -0
  104. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/NoAlertOpenException.kt +0 -0
  105. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/NoSuchDriverException.kt +0 -0
  106. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/NoSuchElementException.kt +0 -0
  107. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/NotYetImplementedException.kt +0 -0
  108. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/ScreenCaptureException.kt +0 -0
  109. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/SessionNotCreatedException.kt +0 -0
  110. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/StaleElementException.kt +0 -0
  111. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/exceptions/XPathLookupException.kt +0 -0
  112. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/AccessibilityServiceState.kt +0 -0
  113. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ActivityHelpers.kt +0 -0
  114. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ActivityOptionsHelpers.kt +0 -0
  115. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/AlertHelpers.kt +0 -0
  116. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/AndroidLogger.kt +0 -0
  117. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/AssertHelpers.kt +0 -0
  118. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/AutofillHelpers.kt +0 -0
  119. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/BackdoorUtils.java +0 -0
  120. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ClipboardHelper.kt +0 -0
  121. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/CustomFailureHandler.kt +0 -0
  122. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/DeviceInfoHelper.kt +0 -0
  123. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/EspressoViewsCache.kt +0 -0
  124. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/GsonParserHelpers.kt +0 -0
  125. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/IMEHelpers.kt +0 -0
  126. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/IntentHelpers.kt +0 -0
  127. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/InteractionHelper.kt +0 -0
  128. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/InvocationOperation.java +0 -0
  129. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/LocaleHelpers.kt +0 -0
  130. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/Logger.kt +0 -0
  131. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/NotificationListener.kt +0 -0
  132. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/Rect.kt +0 -0
  133. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ReflectionUtils.kt +0 -0
  134. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ScreenshotHelpers.kt +0 -0
  135. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/SizeHelpers.kt +0 -0
  136. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/StringHelpers.kt +0 -0
  137. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ThreadHelpers.kt +0 -0
  138. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/UiAutomationWrapper.kt +0 -0
  139. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ViewFinder.kt +0 -0
  140. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/XMLHelpers.kt +0 -0
  141. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/extensions/Semaphore.kt +0 -0
  142. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/reflection/ArrayUtils.java +0 -0
  143. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/reflection/ClassUtils.java +0 -0
  144. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/reflection/MethodUtils.java +0 -0
  145. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/reflection/Validate.java +0 -0
  146. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/BaseW3CActionAdapter.kt +0 -0
  147. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/DummyW3CActionAdapter.kt +0 -0
  148. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/W3CActionAdapter.kt +0 -0
  149. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/AndroidKeyEvent.kt +0 -0
  150. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/AndroidMotionEvent.kt +0 -0
  151. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/EspressoW3CActionAdapter.kt +0 -0
  152. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/Helpers.kt +0 -0
  153. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/MotionEventBuilder.kt +0 -0
  154. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/MultiTouchState.kt +0 -0
  155. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/adapter/espresso/TouchState.kt +0 -0
  156. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/caps/CapsUtils.kt +0 -0
  157. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/BaseDispatchResult.kt +0 -0
  158. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/DispatchPointerMoveResult.kt +0 -0
  159. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/KeyDispatch.kt +0 -0
  160. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/PointerDispatch.kt +0 -0
  161. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/W3CKeyEvent.kt +0 -0
  162. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/constants/KeyCodeMapper.kt +0 -0
  163. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/constants/KeyLocationMapper.kt +0 -0
  164. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/constants/KeyNormalizer.kt +0 -0
  165. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/dispatcher/constants/NormalizedKeys.kt +0 -0
  166. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/ActionObject.kt +0 -0
  167. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/ActionSequence.kt +0 -0
  168. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/Actions.kt +0 -0
  169. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/InputSource.kt +0 -0
  170. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/Origin.kt +0 -0
  171. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/OriginDeserializer.kt +0 -0
  172. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/models/Tick.kt +0 -0
  173. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/processor/ActionsProcessor.kt +0 -0
  174. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/processor/KeyProcessor.kt +0 -0
  175. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/processor/PauseProcessor.kt +0 -0
  176. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/processor/PointerProcessor.kt +0 -0
  177. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/processor/ProcessorHelpers.kt +0 -0
  178. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/state/ActiveInputSources.kt +0 -0
  179. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/state/InputState.kt +0 -0
  180. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/state/InputStateTable.kt +0 -0
  181. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/state/KeyInputState.kt +0 -0
  182. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/w3c/state/PointerInputState.kt +0 -0
  183. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/RouteDefinition.kt +0 -0
  184. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/RouteMap.kt +0 -0
  185. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/response/AppiumResponse.kt +0 -0
  186. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/response/BaseResponse.kt +0 -0
  187. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/AlertParams.kt +0 -0
  188. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/AppiumParams.kt +0 -0
  189. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/AttributesEnum.kt +0 -0
  190. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/BackdoorMethodArg.kt +0 -0
  191. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ClipboardDataType.kt +0 -0
  192. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ComposeNodeElement.kt +0 -0
  193. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/DrawerActionParams.kt +0 -0
  194. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/EditorActionParams.kt +0 -0
  195. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/Element.kt +0 -0
  196. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/GetClipboardParams.kt +0 -0
  197. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/GlobalSession.kt +0 -0
  198. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/HamcrestMatcher.kt +0 -0
  199. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/IdlingResourcesParams.kt +0 -0
  200. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/KeyEventParams.kt +0 -0
  201. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/LocaleParams.kt +0 -0
  202. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/Location.kt +0 -0
  203. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/Locator.kt +0 -0
  204. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MatcherJson.kt +0 -0
  205. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MobileBackdoorMethod.kt +0 -0
  206. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MobileBackdoorParams.kt +0 -0
  207. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MobileClickActionParams.kt +0 -0
  208. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MobileSwipeParams.kt +0 -0
  209. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MotionEventParams.kt +0 -0
  210. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MoveToParams.kt +0 -0
  211. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/MultiTouchActionsParams.kt +0 -0
  212. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/NavigateToParams.kt +0 -0
  213. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/OrientationParams.kt +0 -0
  214. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/OrientationType.kt +0 -0
  215. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/Rect.kt +0 -0
  216. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/RotationParams.kt +0 -0
  217. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ScrollToPageParams.kt +0 -0
  218. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/SessionParams.kt +0 -0
  219. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/SetClipboardParams.kt +0 -0
  220. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/SetDateParams.kt +0 -0
  221. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/SetTimeParams.kt +0 -0
  222. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/SettingsParams.kt +0 -0
  223. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/Size.kt +0 -0
  224. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/StartActivityParams.kt +0 -0
  225. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/StartServiceParams.kt +0 -0
  226. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/StopServiceParams.kt +0 -0
  227. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/Strategy.kt +0 -0
  228. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/TextValueParams.kt +0 -0
  229. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ToastLookupParams.kt +0 -0
  230. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/TouchAction.kt +0 -0
  231. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/TouchActionsParams.kt +0 -0
  232. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/UiautomatorParams.kt +0 -0
  233. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ViewElement.kt +0 -0
  234. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ViewFlashParams.kt +0 -0
  235. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/ViewText.kt +0 -0
  236. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/WindowRect.kt +0 -0
  237. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/WindowSize.kt +0 -0
  238. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/settings/AbstractSetting.kt +0 -0
  239. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/settings/SettingType.kt +0 -0
  240. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/web/WebAtom.kt +0 -0
  241. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/web/WebAtomDeserializer.kt +0 -0
  242. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/web/WebAtomsMethods.kt +0 -0
  243. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/model/web/WebAtomsParams.kt +0 -0
  244. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewaction/OrientationChange.kt +0 -0
  245. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewaction/ScrollTo.kt +0 -0
  246. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewaction/UiControllerPerformer.kt +0 -0
  247. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewaction/UiControllerRunnable.kt +0 -0
  248. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewaction/ViewGetter.kt +0 -0
  249. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewaction/ViewTextGetter.kt +0 -0
  250. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewmatcher/RegexpTextMatcher.kt +0 -0
  251. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewmatcher/WithView.kt +0 -0
  252. /package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/viewmatcher/WithXPath.kt +0 -0
  253. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/assets/Helpers.kt +0 -0
  254. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/assets/backdoor-methods.json +0 -0
  255. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/assets/key-actions.json +0 -0
  256. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/assets/multi-touch-actions.json +0 -0
  257. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/GsonParserHelpersTest.kt +0 -0
  258. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/IntentCreationTests.kt +0 -0
  259. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/InvocationOperationTest.java +0 -0
  260. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/KReflectionUtilsTest.kt +0 -0
  261. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/XpathQueryParserTests.kt +0 -0
  262. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/ActionSequenceTest.kt +0 -0
  263. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/ActionsTest.kt +0 -0
  264. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/CapsUtilsTest.kt +0 -0
  265. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/Helpers.kt +0 -0
  266. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/InputSourceTest.kt +0 -0
  267. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/InputStateTableTest.kt +0 -0
  268. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/KeyDispatchTest.kt +0 -0
  269. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/KeyInputStateTest.kt +0 -0
  270. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/PointerDispatchTest.kt +0 -0
  271. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/ProcessorTest.kt +0 -0
  272. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/TickTest.kt +0 -0
  273. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/adapter/AndroidKeyEventTest.kt +0 -0
  274. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/helpers/w3c/adapter/HelpersTest.kt +0 -0
  275. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/http/RouteDefinitionTest.kt +0 -0
  276. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/HamcrestMatcherTest.kt +0 -0
  277. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/MatcherJsonTest.kt +0 -0
  278. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/MobileBackdoorMethodTest.java +0 -0
  279. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/MobileClickTest.kt +0 -0
  280. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/MobileSwipeTest.kt +0 -0
  281. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/TouchActionTest.kt +0 -0
  282. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/web/WebAtomTest.kt +0 -0
  283. /package/espresso-server/{app → library}/src/test/java/io/appium/espressoserver/test/model/web/WebAtomsTest.kt +0 -0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,19 @@
1
+ ## [3.1.0](https://github.com/appium/appium-espresso-driver/compare/v3.0.0...v3.1.0) (2024-07-11)
2
+
3
+ ### Features
4
+
5
+ * Publish Espresso server library to JitPack ([#1021](https://github.com/appium/appium-espresso-driver/issues/1021)) ([9445667](https://github.com/appium/appium-espresso-driver/commit/94456673880e591808e06db57da1d21ec823ec0c))
6
+
7
+ ## [3.0.0](https://github.com/appium/appium-espresso-driver/compare/v2.44.2...v3.0.0) (2024-07-10)
8
+
9
+ ### ⚠ BREAKING CHANGES
10
+
11
+ * `appiumZipAlign` Gradle property has been removed as it didn't have any effect
12
+
13
+ ### Features
14
+
15
+ * Make it possible to consume Espresso server as a library ([#1020](https://github.com/appium/appium-espresso-driver/issues/1020)) ([1bf4a92](https://github.com/appium/appium-espresso-driver/commit/1bf4a928a32501071ae88e7f16d2521b29859aa9))
16
+
1
17
  ## [2.44.2](https://github.com/appium/appium-espresso-driver/compare/v2.44.1...v2.44.2) (2024-07-09)
2
18
 
3
19
  ### Miscellaneous Chores
package/README.md CHANGED
@@ -261,7 +261,7 @@ annotationVersion | The target version of `androidx.annotation:annotation` pakag
261
261
 
262
262
  ### additionalAppDependencies
263
263
 
264
- The value of this entry must be a non empty array of dependent module names with their versions. The scripts adds all these items as `implementation` lines of `dependencies` category in the app [build.gradle.kts](https://github.com/appium/appium-espresso-driver/blob/master/espresso-server/app/build.gradle.kts) script. Example: `["xerces.xercesImpl:2.8.0", "xerces.xmlParserAPIs:2.6.2"]`
264
+ The value of this entry must be a non empty array of dependent module names with their versions. The scripts adds all these items as `api` lines of `dependencies` category in the library [build.gradle.kts](https://github.com/appium/appium-espresso-driver/blob/master/espresso-server/library/build.gradle.kts) script. Example: `["xerces.xercesImpl:2.8.0", "xerces.xmlParserAPIs:2.6.2"]`
265
265
 
266
266
  ### additionalAndroidTestDependencies
267
267
 
package/build/lib/server-builder.js CHANGED
@@ -133,7 +133,7 @@ class ServerBuilder {
133
133
  let configuration = await support_1.fs.readFile(buildPath, 'utf8');
134
134
  for (const propName of DEPENDENCY_PROP_NAMES) {
135
135
  const prefix = propName === DEPENDENCY_PROP_NAMES[0]
136
- ? 'implementation'
136
+ ? 'api'
137
137
  : 'androidTestImplementation';
138
138
  const deps = this[propName]
139
139
  .filter((line) => lodash_1.default.trim(line))
package/build/lib/server-builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-builder.js","sourceRoot":"","sources":["../../lib/server-builder.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-builder.js","sourceRoot":"","sources":["../../lib/server-builder.js"],"names":[],"mappings":"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"}
package/espresso-server/app/build.gradle.kts CHANGED
@@ -3,43 +3,52 @@ plugins {
3
3
  kotlin("android")
4
4
  }
5
5
 
6
+ val appiumCompileSdk: String by project
7
+ val appiumMinSdk: String by project
8
+ val appiumTargetSdk: String by project
9
+ val appiumBuildTools: String by project
10
+ val appiumTargetPackage: String by project
11
+ val appiumSourceCompatibility: String by project
12
+ val appiumTargetCompatibility: String by project
13
+ val appiumJvmTarget: String by project
14
+ val appiumKotlin: String by project
15
+ val appiumAndroidxTestVersion: String by project
16
+ val appiumAnnotationVersion: String by project
17
+ val appiumComposeVersion: String by project
18
+ val appiumGsonVersion: String by project
19
+ val appiumEspressoVersion: String by project
20
+ val appiumMockitoVersion: String by project
21
+ val appiumNanohttpdVersion: String by project
22
+ val appiumRobolectricVersion: String by project
23
+ val appiumJUnitVersion: String by project
24
+ val appiumUiAutomatorVersion: String by project
25
+
6
26
  android {
7
- compileSdk = getIntProperty("appiumCompileSdk", 34)
8
- buildToolsVersion = getStringProperty("appiumBuildTools", "33.0.2")
27
+ compileSdk = appiumCompileSdk.toInt()
28
+ buildToolsVersion = appiumBuildTools
29
+ namespace = "io.appium.espressoserver"
30
+
9
31
  defaultConfig {
10
32
  // <instrumentation android:targetPackage=""/>
11
- applicationId = getStringProperty("appiumTargetPackage", "io.appium.espressoserver")
33
+ applicationId = appiumTargetPackage
12
34
  // <manifest package=""/>
13
35
  testApplicationId = "io.appium.espressoserver.test"
14
36
  testHandleProfiling = false
15
37
  testFunctionalTest = false
16
- minSdk = getIntProperty("appiumMinSdk", 21)
17
- targetSdk = getIntProperty("appiumTargetSdk", 34)
38
+ minSdk = appiumMinSdk.toInt()
39
+ targetSdk = appiumTargetSdk.toInt()
18
40
  versionCode = 1
19
41
  versionName = "1.0"
20
42
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
21
43
  }
22
44
 
23
45
  buildTypes {
24
- getByName("debug") {
25
- isZipAlignEnabled = getBooleanProperty("appiumZipAlign", true)
26
- }
27
46
  getByName("release") {
28
47
  isMinifyEnabled = false
29
48
  proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
30
49
  }
31
50
  }
32
51
 
33
- sourceSets {
34
- getByName("test") {
35
- java.srcDirs("src/androidTest/java")
36
- }
37
- }
38
-
39
- testOptions {
40
- unitTests.isReturnDefaultValues = true
41
- }
42
-
43
52
  signingConfigs {
44
53
  getByName("debug") {
45
54
  findProperty("appiumKeystoreFile")?.also {
@@ -61,124 +70,24 @@ android {
61
70
  }
62
71
 
63
72
  compileOptions {
64
- sourceCompatibility = JavaVersion.valueOf(
65
- getStringProperty(
66
- "appiumSourceCompatibility",
67
- "VERSION_1_8"
68
- ).toUpperCase()
69
- )
70
- targetCompatibility = JavaVersion.valueOf(
71
- getStringProperty(
72
- "appiumTargetCompatibility",
73
- "VERSION_1_8"
74
- ).toUpperCase()
75
- )
73
+ sourceCompatibility = JavaVersion.valueOf(appiumSourceCompatibility.uppercase())
74
+ targetCompatibility = JavaVersion.valueOf(appiumTargetCompatibility.uppercase())
76
75
  }
77
76
 
78
77
  kotlinOptions {
79
- jvmTarget = getStringProperty("appiumJvmTarget", JavaVersion.VERSION_1_8.toString())
78
+ jvmTarget = appiumJvmTarget
80
79
  }
81
80
 
82
- packagingOptions {
81
+ packaging {
83
82
  resources.excludes.add("META-INF/**")
84
83
  }
85
-
86
- namespace = "io.appium.espressoserver"
87
84
  }
88
85
 
89
- val kotlinVersion = rootProject.extra["appiumKotlin"]
90
- val composeVersion = getStringProperty("appiumComposeVersion", Version.compose)
91
- val espressoVersion = getStringProperty("appiumEspressoVersion", Version.espresso)
92
- val annotationVersion = getStringProperty("appiumAnnotationVersion", Version.annotation)
93
-
94
86
  dependencies {
95
- implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
96
- // additionalAppDependencies placeholder (don't change or delete this line)
97
-
98
- testImplementation("org.powermock:powermock-api-mockito2:${Version.mocklib}")
99
- testImplementation("org.powermock:powermock-classloading-xstream:${Version.mocklib}")
100
- testImplementation("org.powermock:powermock-module-junit4-rule:${Version.mocklib}")
101
- testImplementation("org.powermock:powermock-module-junit4:${Version.mocklib}")
102
- testImplementation("androidx.annotation:annotation:${annotationVersion}")
103
- testImplementation("androidx.test.espresso:espresso-contrib:${espressoVersion}")
104
- testImplementation("androidx.test.espresso:espresso-core:${espressoVersion}")
105
- testImplementation("androidx.test.espresso:espresso-web:${espressoVersion}")
106
- testImplementation("androidx.test.uiautomator:uiautomator:${Version.uia}")
107
- testImplementation("androidx.test:core:${Version.testlib}")
108
- testImplementation("androidx.test:runner:${Version.testlib}")
109
- testImplementation("androidx.test:rules:${Version.testlib}")
110
- testImplementation("com.google.code.gson:gson:${Version.gson}")
111
- testImplementation("junit:junit:${Version.junit}")
112
- testImplementation("org.mockito:mockito-core:${Version.mockito}")
113
- testImplementation("org.nanohttpd:nanohttpd-webserver:${Version.nanohttpd}")
114
- testImplementation("org.robolectric:robolectric:${Version.robolectric}")
115
- testImplementation("org.jetbrains.kotlin:kotlin-test:${kotlinVersion}")
116
- testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
117
- testImplementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
118
- testImplementation("androidx.compose.ui:ui-test:${composeVersion}")
119
- testImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}")
120
-
121
- androidTestImplementation("androidx.annotation:annotation:${annotationVersion}")
122
- androidTestImplementation("androidx.test.espresso:espresso-contrib:${espressoVersion}") {
123
- // Exclude transitive dependencies to limit conflicts with AndroidX libraries from AUT.
124
- // Link to PR with fix and discussion https://github.com/appium/appium-espresso-driver/pull/596
125
- isTransitive = false
126
- }
127
- androidTestImplementation("androidx.test.espresso:espresso-web:${espressoVersion}") {
128
- because("Espresso Web Atoms support (mobile: webAtoms)")
129
- }
130
- androidTestImplementation("androidx.test.uiautomator:uiautomator:${Version.uia}") {
131
- because("UiAutomator support (mobile: uiautomator)")
132
- }
133
- androidTestImplementation("androidx.test:core:${Version.testlib}")
134
- androidTestImplementation("androidx.test:runner:${Version.testlib}")
135
- androidTestImplementation("androidx.test:rules:${Version.testlib}")
136
- androidTestImplementation("com.google.code.gson:gson:${Version.gson}")
137
- androidTestImplementation("org.nanohttpd:nanohttpd-webserver:${Version.nanohttpd}")
138
- androidTestImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
139
- androidTestImplementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
140
- androidTestImplementation("androidx.compose.ui:ui-test:${composeVersion}") {
141
- because("Android Compose support")
142
- }
143
- androidTestImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}") {
144
- because("Android Compose support")
145
- }
87
+ androidTestImplementation(project(":library"))
88
+ androidTestImplementation("junit:junit:$appiumJUnitVersion")
89
+ androidTestImplementation("androidx.test:core:$appiumAndroidxTestVersion")
90
+ androidTestImplementation("androidx.test:runner:$appiumAndroidxTestVersion")
146
91
 
147
92
  // additionalAndroidTestDependencies placeholder (don't change or delete this line)
148
93
  }
149
-
150
- configurations.all {
151
- resolutionStrategy.eachDependency {
152
- // To avoid "androidx.annotation:annotation" version conflict.
153
- if (requested.group == "androidx.annotation" && !requested.name.contains("annotation")) {
154
- useVersion(annotationVersion)
155
- }
156
- }
157
- }
158
-
159
- tasks.withType<Test> {
160
- systemProperty("skipespressoserver", "true")
161
- }
162
-
163
- object Version {
164
- const val espresso = "3.5.1"
165
- const val testlib = "1.5.0"
166
- const val mocklib = "2.0.9"
167
- const val gson = "2.10.1"
168
- const val uia = "2.2.0"
169
- const val nanohttpd = "2.3.1"
170
- const val annotation = "1.6.0"
171
- const val mockito = "5.1.1"
172
- const val robolectric = "4.9.2"
173
- const val junit = "4.13.2"
174
- const val compose = "1.1.1"
175
- }
176
-
177
- fun Project.getStringProperty(name: String, default: String): String =
178
- properties.getOrDefault(name, default).toString()
179
-
180
- fun Project.getIntProperty(name: String, default: Int): Int =
181
- this.getStringProperty(name, default.toString()).toInt()
182
-
183
- fun Project.getBooleanProperty(name: String, default: Boolean): Boolean =
184
- this.getStringProperty(name, default.toString()).toBoolean()
package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/EspressoServerRunnerTest.kt CHANGED
@@ -16,22 +16,11 @@
16
16
 
17
17
  package io.appium.espressoserver
18
18
 
19
- import org.junit.Assume
20
- import org.junit.Test
21
-
22
- import java.io.IOException
23
-
24
19
  import androidx.test.filters.LargeTest
25
- import io.appium.espressoserver.lib.drivers.DriverContext
26
- import io.appium.espressoserver.lib.handlers.exceptions.DuplicateRouteException
27
20
  import io.appium.espressoserver.lib.http.Server
28
-
29
21
  import org.junit.Assert.assertEquals
30
22
  import org.junit.Rule
31
- import org.junit.rules.TestRule
32
- import org.junit.runner.Description
33
- import org.junit.runners.model.Statement
34
- import androidx.compose.ui.test.junit4.AndroidComposeTestRule
23
+ import org.junit.Test
35
24
 
36
25
  /**
37
26
  * Instrumentation test, which will execute on an Android device.
@@ -42,51 +31,12 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
42
31
  class EspressoServerRunnerTest {
43
32
 
44
33
  @get:Rule
45
- val composeRule = AndroidComposeTestRule(
46
- activityRule = EmptyTestRule(),
47
- activityProvider = { error("Can't provide current activity") }
48
- ).also {
49
- composeTestRule = it
50
- }
51
-
52
- private val syncComposeClock = Thread {
53
- while (!Server.isStopRequestReceived) {
54
- if (context.currentStrategyType == DriverContext.StrategyType.COMPOSE) {
55
- composeTestRule.mainClock.advanceTimeByFrame()
56
- }
57
- // Let Android run measure, draw and in general any other async operations. AndroidComposeTestRule.android.kt:325
58
- Thread.sleep(ANDROID_ASYNC_WAIT_TIME_MS)
59
- }
60
- }
34
+ val server = Server()
61
35
 
62
36
  @Test
63
- @Throws(InterruptedException::class, IOException::class, DuplicateRouteException::class)
64
37
  fun startEspressoServer() {
65
- if (System.getProperty("skipespressoserver") != null) {
66
- Assume.assumeTrue(true)
67
- return
68
- }
69
- try {
70
- Server.start()
71
- syncComposeClock.start()
72
- while (!Server.isStopRequestReceived) {
73
- Thread.sleep(1000)
74
- }
75
- } finally {
76
- Server.stop()
77
- syncComposeClock.join()
78
- }
38
+ server.run()
79
39
 
80
40
  assertEquals(true, true) // Keep Codacy happy
81
41
  }
82
-
83
- class EmptyTestRule : TestRule {
84
- override fun apply(base: Statement, description: Description): Statement = base
85
- }
86
-
87
- companion object {
88
- lateinit var composeTestRule: AndroidComposeTestRule<*, *>
89
- val context = DriverContext()
90
- const val ANDROID_ASYNC_WAIT_TIME_MS = 10L
91
- }
92
42
  }
package/espresso-server/build.gradle.kts CHANGED
@@ -1,21 +1,16 @@
1
1
  // Top-level build file where you can add configuration options common to all sub-projects/modules.
2
2
 
3
3
  buildscript {
4
- extra.apply {
5
- set("appiumKotlin", properties.getOrDefault("appiumKotlin", "1.8.10"))
6
- set(
7
- "appiumAndroidGradlePlugin",
8
- properties.getOrDefault("appiumAndroidGradlePlugin", "8.5.0")
9
- )
10
- }
4
+ val appiumKotlin: String by project
5
+ val appiumAndroidGradlePlugin: String by project
11
6
 
12
7
  repositories {
13
8
  google()
14
9
  mavenCentral()
15
10
  }
16
11
  dependencies {
17
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["appiumKotlin"]}")
18
- classpath("com.android.tools.build:gradle:${rootProject.extra["appiumAndroidGradlePlugin"]}")
12
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$appiumKotlin")
13
+ classpath("com.android.tools.build:gradle:$appiumAndroidGradlePlugin")
19
14
 
20
15
  // NOTE: Do not place your application dependencies here; they belong
21
16
  // in the individual module build.gradle.kts files
@@ -27,6 +22,8 @@ allprojects {
27
22
  google()
28
23
  mavenCentral()
29
24
  }
25
+
26
+ group = "io.appium.espressoserver"
30
27
  }
31
28
 
32
29
  tasks.register("clean", Delete::class) {
package/espresso-server/gradle.properties CHANGED
@@ -24,3 +24,25 @@ org.gradle.vfs.watch=true
24
24
  org.gradle.caching=true
25
25
  # https://youtrack.jetbrains.com/issue/KT-46708
26
26
  kotlin.stdlib.default.dependency=false
27
+
28
+ appiumCompileSdk=34
29
+ appiumMinSdk=21
30
+ appiumTargetSdk=34
31
+ appiumBuildTools=34.0.0
32
+ appiumTargetPackage=io.appium.espressoserver
33
+ appiumSourceCompatibility=VERSION_1_8
34
+ appiumTargetCompatibility=VERSION_1_8
35
+ appiumJvmTarget=1.8
36
+
37
+ appiumAndroidGradlePlugin=8.5.0
38
+ appiumKotlin=1.8.10
39
+ appiumAndroidxTestVersion=1.5.0
40
+ appiumAnnotationVersion=1.6.0
41
+ appiumComposeVersion=1.1.1
42
+ appiumGsonVersion=2.10.1
43
+ appiumEspressoVersion=3.5.1
44
+ appiumMockitoVersion=5.1.1
45
+ appiumNanohttpdVersion=2.3.1
46
+ appiumRobolectricVersion=4.9.2
47
+ appiumJUnitVersion=4.13.2
48
+ appiumUiAutomatorVersion=2.2.0
package/espresso-server/library/build.gradle.kts ADDED
@@ -0,0 +1,111 @@
1
+ plugins {
2
+ id("com.android.library")
3
+ kotlin("android")
4
+ `maven-publish`
5
+ }
6
+
7
+ val appiumCompileSdk: String by project
8
+ val appiumMinSdk: String by project
9
+ val appiumTargetSdk: String by project
10
+ val appiumBuildTools: String by project
11
+ val appiumSourceCompatibility: String by project
12
+ val appiumTargetCompatibility: String by project
13
+ val appiumJvmTarget: String by project
14
+ val appiumKotlin: String by project
15
+ val appiumAndroidxTestVersion: String by project
16
+ val appiumAnnotationVersion: String by project
17
+ val appiumComposeVersion: String by project
18
+ val appiumGsonVersion: String by project
19
+ val appiumEspressoVersion: String by project
20
+ val appiumNanohttpdVersion: String by project
21
+ val appiumRobolectricVersion: String by project
22
+ val appiumJUnitVersion: String by project
23
+ val appiumUiAutomatorVersion: String by project
24
+
25
+ android {
26
+ compileSdk = appiumCompileSdk.toInt()
27
+ buildToolsVersion = appiumBuildTools
28
+ namespace = "io.appium.espressoserver.lib"
29
+
30
+ defaultConfig {
31
+ minSdk = appiumMinSdk.toInt()
32
+ }
33
+
34
+ compileOptions {
35
+ sourceCompatibility = JavaVersion.valueOf(appiumSourceCompatibility.uppercase())
36
+ targetCompatibility = JavaVersion.valueOf(appiumTargetCompatibility.uppercase())
37
+ }
38
+
39
+ packaging {
40
+ resources.excludes.add("META-INF/**")
41
+ }
42
+
43
+ kotlinOptions {
44
+ jvmTarget = appiumJvmTarget
45
+ }
46
+
47
+ lint {
48
+ targetSdk = appiumTargetSdk.toInt()
49
+ }
50
+
51
+ testOptions {
52
+ targetSdk = appiumTargetSdk.toInt()
53
+ unitTests.isReturnDefaultValues = true
54
+ }
55
+
56
+ publishing {
57
+ singleVariant("release") {
58
+ withSourcesJar()
59
+ }
60
+ }
61
+ }
62
+
63
+ publishing {
64
+ publications {
65
+ register<MavenPublication>("release") {
66
+ afterEvaluate {
67
+ from(components["release"])
68
+ }
69
+ }
70
+ }
71
+ }
72
+
73
+ dependencies {
74
+ // additionalAppDependencies placeholder (don't change or delete this line)
75
+
76
+ api("androidx.annotation:annotation:$appiumAnnotationVersion")
77
+ api("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion") {
78
+ // Exclude transitive dependencies to limit conflicts with AndroidX libraries from AUT.
79
+ // Link to PR with fix and discussion https://github.com/appium/appium-espresso-driver/pull/596
80
+ isTransitive = false
81
+ }
82
+ api("androidx.test.espresso:espresso-web:$appiumEspressoVersion") {
83
+ because("Espresso Web Atoms support (mobile: webAtoms)")
84
+ }
85
+ api("androidx.test.uiautomator:uiautomator:$appiumUiAutomatorVersion") {
86
+ because("UiAutomator support (mobile: uiautomator)")
87
+ }
88
+ api("androidx.test:core:$appiumAndroidxTestVersion")
89
+ api("androidx.test:runner:$appiumAndroidxTestVersion")
90
+ api("androidx.test:rules:$appiumAndroidxTestVersion")
91
+ api("com.google.code.gson:gson:$appiumGsonVersion")
92
+ api("org.nanohttpd:nanohttpd-webserver:$appiumNanohttpdVersion")
93
+ api("org.jetbrains.kotlin:kotlin-stdlib:$appiumKotlin")
94
+ api("org.jetbrains.kotlin:kotlin-reflect:$appiumKotlin")
95
+ api("androidx.compose.ui:ui-test:$appiumComposeVersion") {
96
+ because("Android Compose support")
97
+ }
98
+ api("androidx.compose.ui:ui-test-junit4:$appiumComposeVersion") {
99
+ because("Android Compose support")
100
+ }
101
+
102
+ testImplementation("androidx.test.espresso:espresso-contrib:$appiumEspressoVersion")
103
+ testImplementation("junit:junit:$appiumJUnitVersion")
104
+ testImplementation("org.robolectric:robolectric:$appiumRobolectricVersion")
105
+ testImplementation("org.jetbrains.kotlin:kotlin-test:$appiumKotlin")
106
+ testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$appiumKotlin")
107
+
108
+ constraints {
109
+ api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$appiumKotlin")
110
+ }
111
+ }
package/espresso-server/library/src/main/AndroidManifest.xml ADDED
@@ -0,0 +1,6 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android">
3
+
4
+ <uses-permission android:name="android.permission.INTERNET" />
5
+
6
+ </manifest>
package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/drivers/DriverContext.kt RENAMED
@@ -16,10 +16,14 @@
16
16
 
17
17
  package io.appium.espressoserver.lib.drivers
18
18
 
19
- class DriverContext {
19
+ import androidx.compose.ui.test.junit4.createEmptyComposeRule
20
+
21
+ object DriverContext {
20
22
  var currentStrategyType: StrategyType = StrategyType.ESPRESSO
21
23
  private set
22
24
 
25
+ val composeTestRule = createEmptyComposeRule()
26
+
23
27
  fun setDriverStrategy(strategyType: StrategyType) {
24
28
  currentStrategyType = strategyType
25
29
  }
package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/DeleteSession.kt RENAMED
@@ -22,12 +22,12 @@ import io.appium.espressoserver.lib.http.response.AppiumResponse
22
22
  import io.appium.espressoserver.lib.model.AppiumParams
23
23
  import io.appium.espressoserver.lib.model.GlobalSession
24
24
 
25
- class DeleteSession : RequestHandler<AppiumParams, AppiumResponse> {
25
+ class DeleteSession(private val server: Server) : RequestHandler<AppiumParams, AppiumResponse> {
26
26
 
27
27
  override fun handleInternal(params: AppiumParams): AppiumResponse {
28
28
  NotificationListener.stop()
29
29
  GlobalSession.delete()
30
- Server.makeRequestForServerToStop()
30
+ server.makeRequestForServerToStop()
31
31
  return AppiumResponse(null, null)
32
32
  }
33
33
  }
package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/GetAttribute.kt RENAMED
@@ -19,7 +19,6 @@ package io.appium.espressoserver.lib.handlers
19
19
  import androidx.test.espresso.EspressoException
20
20
  import androidx.test.espresso.ViewInteraction
21
21
  import androidx.test.espresso.assertion.LayoutAssertions
22
- import io.appium.espressoserver.EspressoServerRunnerTest
23
22
  import io.appium.espressoserver.lib.drivers.DriverContext
24
23
  import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
25
24
  import io.appium.espressoserver.lib.handlers.exceptions.NotYetImplementedException
@@ -39,7 +38,7 @@ class GetAttribute : RequestHandler<AppiumParams, String?> {
39
38
  throw AppiumException("Attribute name cannot be null or empty")
40
39
  }
41
40
 
42
- return when (EspressoServerRunnerTest.context.currentStrategyType) {
41
+ return when (DriverContext.currentStrategyType) {
43
42
  DriverContext.StrategyType.COMPOSE -> getComposeAttribute(params.elementId!!, attributeName)
44
43
  DriverContext.StrategyType.ESPRESSO -> getEspressoAttribute(params.elementId!!, attributeName)
45
44
  }
package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/handlers/RequestHandler.kt RENAMED
@@ -16,21 +16,21 @@
16
16
 
17
17
  package io.appium.espressoserver.lib.handlers
18
18
 
19
- import io.appium.espressoserver.EspressoServerRunnerTest
19
+ import io.appium.espressoserver.lib.drivers.DriverContext
20
+ import io.appium.espressoserver.lib.drivers.DriverContext.StrategyType
20
21
  import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
21
22
  import io.appium.espressoserver.lib.handlers.exceptions.NoSuchDriverException
22
23
  import io.appium.espressoserver.lib.handlers.exceptions.NotYetImplementedException
23
24
  import io.appium.espressoserver.lib.helpers.AndroidLogger
24
25
  import io.appium.espressoserver.lib.model.AppiumParams
25
26
  import io.appium.espressoserver.lib.model.GlobalSession
26
- import io.appium.espressoserver.lib.drivers.DriverContext.StrategyType
27
27
 
28
28
  interface RequestHandler<in T : AppiumParams, out R> {
29
29
  fun handleInternal(params: T): R = invokeStrategy(params)
30
30
 
31
31
  @Suppress("UNCHECKED_CAST")
32
32
  fun invokeStrategy(params: AppiumParams): R =
33
- when (EspressoServerRunnerTest.context.currentStrategyType) {
33
+ when (DriverContext.currentStrategyType) {
34
34
  StrategyType.COMPOSE -> handleCompose(params as T)
35
35
  StrategyType.ESPRESSO -> handleEspresso(params as T)
36
36
  }
package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/helpers/ComposeNodeFinder.kt RENAMED
@@ -18,7 +18,7 @@ package io.appium.espressoserver.lib.helpers
18
18
 
19
19
  import androidx.compose.ui.semantics.SemanticsNode
20
20
  import androidx.compose.ui.test.*
21
- import io.appium.espressoserver.EspressoServerRunnerTest
21
+ import io.appium.espressoserver.lib.drivers.DriverContext
22
22
  import io.appium.espressoserver.lib.handlers.exceptions.InvalidSelectorException
23
23
  import io.appium.espressoserver.lib.model.Strategy
24
24
  import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
@@ -40,7 +40,7 @@ fun getNodeInteractionById(elementId: String?): SemanticsNodeInteraction =
40
40
  fun toNodeInteractionsCollection(params: Locator): SemanticsNodeInteractionCollection {
41
41
  val parentNodeInteraction = params.elementId?.let { getNodeInteractionById(it) }
42
42
  return parentNodeInteraction?.findDescendantNodeInteractions(params)
43
- ?: EspressoServerRunnerTest.composeTestRule.onAllNodes(
43
+ ?: DriverContext.composeTestRule.onAllNodes(
44
44
  useUnmergedTree = true,
45
45
  matcher = semanticsMatcherForLocator(params)
46
46
  )
package/espresso-server/{app/src/androidTest → library/src/main}/java/io/appium/espressoserver/lib/http/Router.kt RENAMED
@@ -31,7 +31,7 @@ import io.appium.espressoserver.lib.http.response.BaseResponse
31
31
  import io.appium.espressoserver.lib.model.*
32
32
  import io.appium.espressoserver.lib.model.web.WebAtomsParams
33
33
 
34
- internal class Router {
34
+ internal class Router(server: Server) {
35
35
  private val routeMap: RouteMap
36
36
 
37
37
  init {
@@ -43,7 +43,7 @@ internal class Router {
43
43
  routeMap.addRoute(RouteDefinition(Method.GET, "/session/:sessionId", GetSession(), AppiumParams::class.java))
44
44
  routeMap.addRoute(RouteDefinition(Method.POST, "/session/:sessionId/actions", PerformAction(), Actions::class.java))
45
45
  routeMap.addRoute(RouteDefinition(Method.DELETE, "/session/:sessionId/actions", ReleaseActions(), Actions::class.java))
46
- routeMap.addRoute(RouteDefinition(Method.DELETE, "/session/:sessionId", DeleteSession(), AppiumParams::class.java))
46
+ routeMap.addRoute(RouteDefinition(Method.DELETE, "/session/:sessionId", DeleteSession(server), AppiumParams::class.java))
47
47
  routeMap.addRoute(RouteDefinition(Method.POST, "/session/:sessionId/back", Back(), AppiumParams::class.java))
48
48
  routeMap.addRoute(RouteDefinition(Method.POST, "/session/:sessionId/accept_alert", AcceptAlert(), AlertParams::class.java))
49
49
  // alias