appium-espresso-driver 10.2.1 → 10.3.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.
- package/CHANGELOG.md +6 -0
- package/build/lib/commands/server/builder.d.ts +9 -0
- package/build/lib/commands/server/builder.d.ts.map +1 -1
- package/build/lib/commands/server/builder.js +23 -0
- package/build/lib/commands/server/builder.js.map +1 -1
- package/build/lib/commands/server/hints.d.ts +28 -0
- package/build/lib/commands/server/hints.d.ts.map +1 -0
- package/build/lib/commands/server/hints.js +54 -0
- package/build/lib/commands/server/hints.js.map +1 -0
- package/build/lib/commands/server/runner.d.ts +7 -0
- package/build/lib/commands/server/runner.d.ts.map +1 -1
- package/build/lib/commands/server/runner.js +43 -4
- package/build/lib/commands/server/runner.js.map +1 -1
- package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
- package/espresso-server/app/build.gradle.kts +91 -1
- package/espresso-server/app/src/androidTestShaded/AndroidManifest.xml +16 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
- package/espresso-server/buildSrc/build/classes/kotlin/main/META-INF/buildSrc.kotlin_module +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitField$1$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitMethod$1$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/MemberRef.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/PrefixRemapper.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$groupingBy$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$sortedByDescending$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$9$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$remapper$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1$visitMethod$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$referencedClasses$collector$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$shareNonPublicDependents$Declared.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt.class +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab +1 -1
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin +0 -0
- package/espresso-server/buildSrc/build/libs/buildSrc.jar +0 -0
- package/espresso-server/buildSrc/build.gradle.kts +6 -0
- package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/RelocateClassesTask.kt +141 -0
- package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/Relocation.kt +342 -0
- package/espresso-server/buildSrc/src/test/kotlin/io/appium/espressoserver/gradle/RelocationTest.kt +186 -0
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/ListIdlingResources.kt +2 -1
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/ShadingHelpers.kt +45 -0
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/http/response/AppiumResponse.kt +3 -2
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/HamcrestMatcher.kt +8 -5
- package/espresso-server/library/src/test/java/io/appium/espressoserver/test/helpers/ShadingHelpersTest.kt +37 -0
- package/lib/commands/server/builder.ts +29 -0
- package/lib/commands/server/hints.ts +69 -0
- package/lib/commands/server/runner.ts +53 -5
- package/node_modules/appium-adb/CHANGELOG.md +7 -0
- package/node_modules/appium-adb/package.json +3 -3
- package/node_modules/appium-android-driver/CHANGELOG.md +23 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts +10 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js +15 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts +9 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js +37 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/device/common.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/device/common.js +2 -0
- package/node_modules/appium-android-driver/build/lib/commands/device/common.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/log.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/log.js +5 -1
- package/node_modules/appium-android-driver/build/lib/commands/log.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js +2 -4
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js.map +1 -1
- package/node_modules/appium-android-driver/lib/commands/bidi/helpers.ts +16 -0
- package/node_modules/appium-android-driver/lib/commands/bidi/logcat-level.ts +40 -0
- package/node_modules/appium-android-driver/lib/commands/device/common.ts +2 -0
- package/node_modules/appium-android-driver/lib/commands/log.ts +5 -1
- package/node_modules/appium-android-driver/lib/commands/media-stream/exports.ts +2 -11
- package/node_modules/appium-android-driver/package.json +5 -5
- package/node_modules/appium-chromedriver/CHANGELOG.md +7 -0
- package/node_modules/appium-chromedriver/config/mapping.json +1 -0
- package/node_modules/appium-chromedriver/package.json +2 -2
- package/node_modules/bare-buffer/CMakeLists.txt +3 -3
- package/node_modules/bare-buffer/package.json +1 -1
- package/node_modules/bare-buffer/prebuilds/android-arm/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-ia32/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/darwin-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/darwin-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-arm64-simulator/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-x64-simulator/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/linux-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/linux-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/win32-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/win32-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-url/CMakeLists.txt +5 -5
- package/node_modules/bare-url/package.json +1 -1
- package/node_modules/bare-url/prebuilds/android-arm/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-ia32/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/darwin-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/darwin-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-arm64-simulator/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-x64-simulator/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/linux-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/linux-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/win32-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/win32-x64/bare-url.bare +0 -0
- package/node_modules/ini/package.json +5 -5
- package/node_modules/io.appium.settings/CHANGELOG.md +7 -0
- package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
- package/node_modules/io.appium.settings/package.json +3 -3
- package/package.json +4 -4
- package/scripts/check-shaded-packages.mjs +106 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [10.3.0](https://github.com/appium/appium-espresso-driver/compare/v10.2.1...v10.3.0) (2026-11-18)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* shade the Espresso server dependencies ([#1258](https://github.com/appium/appium-espresso-driver/issues/1258)) ([dcd7cc4](https://github.com/appium/appium-espresso-driver/commit/dcd7cc4382d2a8a7e8c139fa28303d47f4a7d8aa))
|
|
6
|
+
|
|
1
7
|
## [10.2.1](https://github.com/appium/appium-espresso-driver/compare/v10.2.0...v10.2.1) (2026-11-16)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
|
@@ -21,6 +21,12 @@ export interface EspressoBuildConfiguration {
|
|
|
21
21
|
* Defaults to true when omitted.
|
|
22
22
|
*/
|
|
23
23
|
composeSupport?: boolean;
|
|
24
|
+
/**
|
|
25
|
+
* When false, the classes bundled with the Espresso server are not moved to a private package,
|
|
26
|
+
* so they shadow the same classes of the application under test.
|
|
27
|
+
* Defaults to true when omitted.
|
|
28
|
+
*/
|
|
29
|
+
shadeServer?: boolean;
|
|
24
30
|
additionalAppDependencies?: string[];
|
|
25
31
|
additionalAndroidTestDependencies?: string[];
|
|
26
32
|
}
|
|
@@ -41,9 +47,12 @@ export declare class ServerBuilder {
|
|
|
41
47
|
private readonly additionalAppDependencies;
|
|
42
48
|
private readonly additionalAndroidTestDependencies;
|
|
43
49
|
private readonly composeSupport;
|
|
50
|
+
private readonly shadeServer;
|
|
44
51
|
constructor(log: AppiumLogger, args: ServerBuilderOptions);
|
|
45
52
|
build(): Promise<void>;
|
|
46
53
|
private getCommand;
|
|
54
|
+
/** `group:module` of the user declared dependencies, without versions */
|
|
55
|
+
private getSharedDependencyCoordinates;
|
|
47
56
|
private setGradleWrapperVersion;
|
|
48
57
|
private updateGradleDistUrl;
|
|
49
58
|
private insertAdditionalDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/builder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAQhD,eAAO,MAAM,mBAAmB,uEAAuE,CAAC;AAGxG,eAAO,MAAM,YAAY,8NAcf,CAAC;AAEX,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,0BAA0B,CAAC;IAChD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;CAC5C;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyD;IACxF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAgB;IAC1D,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAgB;IAClE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/builder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAQhD,eAAO,MAAM,mBAAmB,uEAAuE,CAAC;AAGxG,eAAO,MAAM,YAAY,8NAcf,CAAC;AAEX,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,iCAAiC,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,0BAA0B,CAAC;IAChD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;CAC5C;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyD;IACxF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAA6B;IAC5D,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAgB;IAC1D,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAgB;IAClE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;gBAE1B,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB;IA2BnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,UAAU;IAuDlB,yEAAyE;IACzE,OAAO,CAAC,8BAA8B;YAQxB,uBAAuB;IAOrC,OAAO,CAAC,mBAAmB;YAOb,4BAA4B;YAwC5B,eAAe;CA8B9B;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,4BAA4B,GAAG,mBAAmB,CAQhG;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,MAAM,EACvB,qBAAqB,EAAE,MAAM,EAC7B,eAAe,EAAE,MAAM,EAAE,GACxB,MAAM,CAgBR"}
|
|
@@ -32,12 +32,14 @@ export class ServerBuilder {
|
|
|
32
32
|
additionalAppDependencies = [];
|
|
33
33
|
additionalAndroidTestDependencies = [];
|
|
34
34
|
composeSupport;
|
|
35
|
+
shadeServer;
|
|
35
36
|
constructor(log, args) {
|
|
36
37
|
this.log = log;
|
|
37
38
|
this.serverPath = args.serverPath;
|
|
38
39
|
this.showGradleLog = args.showGradleLog;
|
|
39
40
|
const buildConfiguration = args.buildConfiguration || {};
|
|
40
41
|
this.composeSupport = buildConfiguration.composeSupport !== false;
|
|
42
|
+
this.shadeServer = buildConfiguration.shadeServer !== false;
|
|
41
43
|
const versionConfiguration = buildConfiguration.toolsVersions || {};
|
|
42
44
|
this.serverVersions = {};
|
|
43
45
|
for (const [key, value] of Object.entries(versionConfiguration)) {
|
|
@@ -96,9 +98,30 @@ export class ServerBuilder {
|
|
|
96
98
|
args.push(composeArg);
|
|
97
99
|
}
|
|
98
100
|
}
|
|
101
|
+
if (!this.shadeServer) {
|
|
102
|
+
const shadeArg = buildProperty('appiumShadeServer', 'false');
|
|
103
|
+
if (shadeArg) {
|
|
104
|
+
args.push(shadeArg);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// The classes of these dependencies are not relocated, so they keep working as they do without shading
|
|
109
|
+
const sharedArg = buildProperty('appiumSharedDependencies', this.getSharedDependencyCoordinates().join(','));
|
|
110
|
+
if (sharedArg) {
|
|
111
|
+
args.push(sharedArg);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
99
114
|
args.push('app:assembleAndroidTest');
|
|
100
115
|
return { cmd, args };
|
|
101
116
|
}
|
|
117
|
+
/** `group:module` of the user declared dependencies, without versions */
|
|
118
|
+
getSharedDependencyCoordinates() {
|
|
119
|
+
const coordinates = DEPENDENCY_PROP_NAMES.flatMap((propName) => this[propName])
|
|
120
|
+
.map((dep) => dep.trim().match(/^([\w.-]+):([\w.-]+)/))
|
|
121
|
+
.filter((match) => match !== null)
|
|
122
|
+
.map((match) => `${match[1]}:${match[2]}`);
|
|
123
|
+
return [...new Set(coordinates)];
|
|
124
|
+
}
|
|
102
125
|
async setGradleWrapperVersion(version) {
|
|
103
126
|
const propertiesPath = path.resolve(this.serverPath, 'gradle', 'wrapper', 'gradle-wrapper.properties');
|
|
104
127
|
const originalProperties = await fs.readFile(propertiesPath, 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../lib/commands/server/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAC5B,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAC,EAAE,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAElD,MAAM,kBAAkB,GAAG,QAAQ,CAAC;AACpC,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAC7C,MAAM,CAAC,MAAM,mBAAmB,GAAG,oEAAoE,CAAC;AACxG,MAAM,qBAAqB,GAAG,CAAC,2BAA2B,EAAE,mCAAmC,CAAU,CAAC;AAE1G,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,kBAAkB;IAClB,qBAAqB;IACrB,YAAY;IACZ,YAAY;IACZ,QAAQ;IACR,WAAW;IACX,QAAQ;IACR,qBAAqB;IACrB,qBAAqB;IACrB,WAAW;IACX,gBAAgB;IAChB,iBAAiB;IACjB,mBAAmB;CACX,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../lib/commands/server/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export interface Hint {
|
|
2
|
+
/** Matches the failure text (instrumentation output, logcat crash buffer, server error) */
|
|
3
|
+
pattern: RegExp;
|
|
4
|
+
/** Anchor of the row that documents the pattern in docs/troubleshooting/class-conflicts.md */
|
|
5
|
+
anchor: string;
|
|
6
|
+
hint: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Only the patterns that have been reproduced are listed here. Every one of them must have
|
|
10
|
+
* a row with the same anchor in the class conflicts troubleshooting page.
|
|
11
|
+
*/
|
|
12
|
+
export declare const HINTS: readonly Hint[];
|
|
13
|
+
/**
|
|
14
|
+
* Finds the hints that apply to the given failure text.
|
|
15
|
+
*
|
|
16
|
+
* @param text - Failure text, e.g. the lines of an instrumentation crash.
|
|
17
|
+
* @returns Hint texts with the link to the docs, without duplicates.
|
|
18
|
+
*/
|
|
19
|
+
export declare function findHints(text: string): string[];
|
|
20
|
+
/**
|
|
21
|
+
* Appends the matching hints to an error message.
|
|
22
|
+
*
|
|
23
|
+
* @param message - The original message.
|
|
24
|
+
* @param text - Failure text to look the hints for in.
|
|
25
|
+
* @returns The message, extended with the hints if there are any.
|
|
26
|
+
*/
|
|
27
|
+
export declare function withHints(message: string, text: string): string;
|
|
28
|
+
//# sourceMappingURL=hints.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hints.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/hints.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,IAAI;IACnB,2FAA2F;IAC3F,OAAO,EAAE,MAAM,CAAC;IAChB,8FAA8F;IAC9F,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,SAAS,IAAI,EAwBhC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAQhD;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAG/D"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
const DOCS_URL = 'https://appium.github.io/appium-espresso-driver/latest/troubleshooting/class-conflicts/';
|
|
2
|
+
const REPORT = 'Please report this as a bug, and attach the logcat crash buffer and your espressoBuildConfig';
|
|
3
|
+
const SHADE_OFF = '"appium:espressoBuildConfig": {"shadeServer": false}';
|
|
4
|
+
/**
|
|
5
|
+
* Only the patterns that have been reproduced are listed here. Every one of them must have
|
|
6
|
+
* a row with the same anchor in the class conflicts troubleshooting page.
|
|
7
|
+
*/
|
|
8
|
+
export const HINTS = [
|
|
9
|
+
{
|
|
10
|
+
pattern: /IllegalAccessError.*io\.appium\.espressoserver\.shaded/s,
|
|
11
|
+
anchor: 'illegal-access-shaded',
|
|
12
|
+
hint: `The server relocation has failed. ${REPORT}. As a workaround try ${SHADE_OFF}`,
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
pattern: /Exception handler was not found via a ServiceLoader/,
|
|
16
|
+
anchor: 'service-loader',
|
|
17
|
+
hint: `A service file of the server was not relocated. ${REPORT}. As a workaround try ${SHADE_OFF}`,
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
pattern: /StartupException.*ClassCastException.*Initializer|ViewTreeLifecycleOwner not found/s,
|
|
21
|
+
anchor: 'startup-initializer',
|
|
22
|
+
hint: `The classes shared with the application under test are not consistent. ${REPORT}. As a workaround try ${SHADE_OFF}`,
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
pattern: /(NoSuchMethodError|NoClassDefFoundError)[^\n]*androidx[./]compose/,
|
|
26
|
+
anchor: 'compose-version',
|
|
27
|
+
hint: 'The Jetpack Compose version of the application under test differs from the one of the Espresso server. ' +
|
|
28
|
+
'Set "toolsVersions": {"composeVersion": "<version of the app>"} in the espressoBuildConfig capability. ' +
|
|
29
|
+
'If the app has no Compose, set "composeSupport": false instead',
|
|
30
|
+
},
|
|
31
|
+
];
|
|
32
|
+
/**
|
|
33
|
+
* Finds the hints that apply to the given failure text.
|
|
34
|
+
*
|
|
35
|
+
* @param text - Failure text, e.g. the lines of an instrumentation crash.
|
|
36
|
+
* @returns Hint texts with the link to the docs, without duplicates.
|
|
37
|
+
*/
|
|
38
|
+
export function findHints(text) {
|
|
39
|
+
return [
|
|
40
|
+
...new Set(HINTS.filter(({ pattern }) => pattern.test(text)).map(({ hint, anchor }) => `Hint: ${hint} (see ${DOCS_URL}#${anchor})`)),
|
|
41
|
+
];
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Appends the matching hints to an error message.
|
|
45
|
+
*
|
|
46
|
+
* @param message - The original message.
|
|
47
|
+
* @param text - Failure text to look the hints for in.
|
|
48
|
+
* @returns The message, extended with the hints if there are any.
|
|
49
|
+
*/
|
|
50
|
+
export function withHints(message, text) {
|
|
51
|
+
const hints = findHints(text);
|
|
52
|
+
return hints.length ? `${message}\n${hints.join('\n')}` : message;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=hints.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hints.js","sourceRoot":"","sources":["../../../../lib/commands/server/hints.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG,yFAAyF,CAAC;AAC3G,MAAM,MAAM,GAAG,8FAA8F,CAAC;AAC9G,MAAM,SAAS,GAAG,sDAAsD,CAAC;AAUzE;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAoB;IACpC;QACE,OAAO,EAAE,yDAAyD;QAClE,MAAM,EAAE,uBAAuB;QAC/B,IAAI,EAAE,qCAAqC,MAAM,yBAAyB,SAAS,EAAE;KACtF;IACD;QACE,OAAO,EAAE,qDAAqD;QAC9D,MAAM,EAAE,gBAAgB;QACxB,IAAI,EAAE,mDAAmD,MAAM,yBAAyB,SAAS,EAAE;KACpG;IACD;QACE,OAAO,EAAE,qFAAqF;QAC9F,MAAM,EAAE,qBAAqB;QAC7B,IAAI,EAAE,0EAA0E,MAAM,yBAAyB,SAAS,EAAE;KAC3H;IACD;QACE,OAAO,EAAE,mEAAmE;QAC5E,MAAM,EAAE,iBAAiB;QACzB,IAAI,EACF,yGAAyG;YACzG,yGAAyG;YACzG,gEAAgE;KACnE;CACF,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO;QACL,GAAG,IAAI,GAAG,CACR,KAAK,CAAC,MAAM,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CACjD,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,EAAE,EAAE,CAAC,SAAS,IAAI,SAAS,QAAQ,IAAI,MAAM,GAAG,CAChE,CACF;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,OAAe,EAAE,IAAY;IACrD,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;AACpE,CAAC"}
|
|
@@ -52,6 +52,13 @@ export declare class EspressoRunner {
|
|
|
52
52
|
private readonly log;
|
|
53
53
|
constructor(log: AppiumLogger, opts: EspressoRunnerOptions);
|
|
54
54
|
isAppPackageChanged(): Promise<boolean>;
|
|
55
|
+
/** Current device time in the format of `logcat -T`, or undefined if it cannot be read. */
|
|
56
|
+
private getDeviceLogTime;
|
|
57
|
+
/**
|
|
58
|
+
* Appends the hints for the known failures to the message. The cause is looked for in the instrumentation
|
|
59
|
+
* output first and in the crash buffer of the device (since the given device time) after that.
|
|
60
|
+
*/
|
|
61
|
+
private withFailureHints;
|
|
55
62
|
/**
|
|
56
63
|
* Installs Espresso server apk on to the device or emulator.
|
|
57
64
|
* Each adb command uses default timeout by them.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAe,MAAM,eAAe,CAAC;AACjH,OAAO,KAAK,EAAC,GAAG,EAAE,UAAU,EAAC,MAAM,YAAY,CAAC;AAChD,OAAO,EAAC,cAAc,EAAS,MAAM,kBAAkB,CAAC;AAOxD,OAAO,EAA0C,KAAK,mBAAmB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAe,MAAM,eAAe,CAAC;AACjH,OAAO,KAAK,EAAC,GAAG,EAAE,UAAU,EAAC,MAAM,YAAY,CAAC;AAChD,OAAO,EAAC,cAAc,EAAS,MAAM,kBAAkB,CAAC;AAOxD,OAAO,EAA0C,KAAK,mBAAmB,EAAC,MAAM,cAAc,CAAC;AAM/F,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mCAAmC,CAAC,EAAE,OAAO,CAAC;IAC9C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,oBAAoB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAiBD,cAAM,aAAc,SAAQ,cAAc;IACxC,oBAAoB,EAAG,oBAAoB,CAAC;IAE7B,YAAY,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,UAAU,EAClB,IAAI,GAAE,QAAe,GACpB,OAAO,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;CAWtC;AAED,qBAAa,cAAc;IACzB,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,UAAU,EAAE,MAAM,CAAC;IACnC,SAAgB,UAAU,EAAE,MAAM,CAAC;IACnC,SAAgB,GAAG,EAAE,GAAG,CAAC;IACzB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,oBAAoB,EAAE,OAAO,CAAC;IAC9C,SAAgB,UAAU,EAAE,MAAM,CAAC;IACnC,SAAgB,OAAO,EAAE,aAAa,CAAC;IACvC,SAAgB,WAAW,EAAE,OAAO,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC;IACxE,SAAgB,YAAY,EAAE,OAAO,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC;IACrE,SAAgB,aAAa,EAAE,MAAM,CAAC;IACtC,SAAgB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxC,SAAgB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7C,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAC5C,SAAgB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/C,SAAgB,mCAAmC,CAAC,EAAE,OAAO,CAAC;IAC9D,SAAgB,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACnD,WAAW,EAAE,UAAU,GAAG,IAAI,CAAQ;IAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;gBAEvB,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,qBAAqB;IAqDpD,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC;IAa7C,2FAA2F;YAC7E,gBAAgB;IAS9B;;;OAGG;YACW,gBAAgB;IAgB9B;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC9B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B/B,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDlC,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA4H/C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YAetB,uBAAuB;YAgCvB,sBAAsB;YAKtB,mBAAmB;CA2ClC;AAiBD;;;;GAIG;AACH,wBAAsB,4BAA4B,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB9G"}
|
|
@@ -9,6 +9,8 @@ import * as semver from 'semver';
|
|
|
9
9
|
import { getPackageInfoSync, getPackageInfo, isPlainObject } from '../../utils/index.js';
|
|
10
10
|
import { ServerBuilder, buildServerSigningConfig } from './builder.js';
|
|
11
11
|
import { ESPRESSO_SERVER_LAUNCH_TIMEOUT_MS, TARGET_PACKAGE_CONTAINER, TEST_APK_PKG } from './constants.js';
|
|
12
|
+
import { findHints, withHints } from './hints.js';
|
|
13
|
+
const MAX_OUTPUT_LINES = 500;
|
|
12
14
|
class EspressoProxy extends WebDriverProxy {
|
|
13
15
|
instrumentationState;
|
|
14
16
|
async proxyCommand(url, method, body = null) {
|
|
@@ -97,6 +99,36 @@ export class EspressoRunner {
|
|
|
97
99
|
`The current package is '${this.appPackage}'`);
|
|
98
100
|
return previousAppPackage !== this.appPackage;
|
|
99
101
|
}
|
|
102
|
+
/** Current device time in the format of `logcat -T`, or undefined if it cannot be read. */
|
|
103
|
+
async getDeviceLogTime() {
|
|
104
|
+
try {
|
|
105
|
+
return (await this.adb.shell(['date', '+%m-%d %H:%M:%S.000'])).trim() || undefined;
|
|
106
|
+
}
|
|
107
|
+
catch (e) {
|
|
108
|
+
this.log.debug(`Cannot read the device time: ${e.message}`);
|
|
109
|
+
return undefined;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Appends the hints for the known failures to the message. The cause is looked for in the instrumentation
|
|
114
|
+
* output first and in the crash buffer of the device (since the given device time) after that.
|
|
115
|
+
*/
|
|
116
|
+
async withFailureHints(message, outputLines, since) {
|
|
117
|
+
let failureText = outputLines.join('\n');
|
|
118
|
+
if (since && findHints(failureText).length === 0) {
|
|
119
|
+
try {
|
|
120
|
+
failureText += '\n' + (await this.adb.adbExec(['logcat', '-d', '-b', 'crash', '-T', since]));
|
|
121
|
+
}
|
|
122
|
+
catch (e) {
|
|
123
|
+
this.log.debug(`Cannot read the crash buffer to look for hints: ${e.message}`);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
const result = withHints(message, failureText);
|
|
127
|
+
if (result !== message) {
|
|
128
|
+
this.log.warn(result.slice(message.length + 1));
|
|
129
|
+
}
|
|
130
|
+
return result;
|
|
131
|
+
}
|
|
100
132
|
/**
|
|
101
133
|
* Installs Espresso server apk on to the device or emulator.
|
|
102
134
|
* Each adb command uses default timeout by them.
|
|
@@ -220,6 +252,9 @@ export class EspressoRunner {
|
|
|
220
252
|
const { manifestPayload } = await getPackageInfo();
|
|
221
253
|
this.log.info(`Starting Espresso Server v${manifestPayload.version} with cmd: adb ${cmd.join(' ')}`);
|
|
222
254
|
let hasSocketError = false;
|
|
255
|
+
const outputLines = [];
|
|
256
|
+
// Crashes that happened before this moment are not related to the launch
|
|
257
|
+
const launchTime = await this.getDeviceLogTime();
|
|
223
258
|
// start the instrumentation process
|
|
224
259
|
this.jwproxy.instrumentationState = {
|
|
225
260
|
exited: false,
|
|
@@ -237,6 +272,10 @@ export class EspressoRunner {
|
|
|
237
272
|
return;
|
|
238
273
|
}
|
|
239
274
|
this.log.debug(`[Instrumentation] ${line.trim()}`);
|
|
275
|
+
outputLines.push(line);
|
|
276
|
+
if (outputLines.length > MAX_OUTPUT_LINES) {
|
|
277
|
+
outputLines.shift();
|
|
278
|
+
}
|
|
240
279
|
// A 'SocketException' indicates that we couldn't connect to the Espresso server,
|
|
241
280
|
// because the INTERNET permission is not set
|
|
242
281
|
if (line.toLowerCase().includes('java.net.socketexception')) {
|
|
@@ -257,8 +296,8 @@ export class EspressoRunner {
|
|
|
257
296
|
`application under test (<uses-permission android:name="android.permission.INTERNET" />)`);
|
|
258
297
|
}
|
|
259
298
|
else if (this.jwproxy.instrumentationState.exited) {
|
|
260
|
-
throw this.log.errorWithException(`Espresso server process has been unexpectedly terminated. ` +
|
|
261
|
-
`Check the Appium server log and the logcat output for more details
|
|
299
|
+
throw this.log.errorWithException(await this.withFailureHints(`Espresso server process has been unexpectedly terminated. ` +
|
|
300
|
+
`Check the Appium server log and the logcat output for more details`, outputLines, launchTime));
|
|
262
301
|
}
|
|
263
302
|
let serverStatus;
|
|
264
303
|
try {
|
|
@@ -275,9 +314,9 @@ export class EspressoRunner {
|
|
|
275
314
|
}
|
|
276
315
|
catch (e) {
|
|
277
316
|
if (/Condition unmet/.test(e.message)) {
|
|
278
|
-
throw this.log.errorWithException(`Timed out waiting for Espresso server to be ` +
|
|
317
|
+
throw this.log.errorWithException(await this.withFailureHints(`Timed out waiting for Espresso server to be ` +
|
|
279
318
|
`online within ${this.serverLaunchTimeout}ms. The timeout value could be ` +
|
|
280
|
-
`customized using 'espressoServerLaunchTimeout' capability
|
|
319
|
+
`customized using 'espressoServerLaunchTimeout' capability`, outputLines, launchTime));
|
|
281
320
|
}
|
|
282
321
|
throw e;
|
|
283
322
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -2,9 +2,15 @@ plugins {
|
|
|
2
2
|
alias(libs.plugins.android.application)
|
|
3
3
|
}
|
|
4
4
|
|
|
5
|
+
import com.android.build.api.artifact.ScopedArtifact
|
|
6
|
+
import com.android.build.api.variant.ScopedArtifacts
|
|
7
|
+
import io.appium.espressoserver.gradle.RelocateClassesTask
|
|
8
|
+
import io.appium.espressoserver.gradle.removeJarEntries
|
|
5
9
|
import io.appium.espressoserver.gradle.withCapabilityVersion
|
|
6
10
|
import io.appium.espressoserver.jvmtarget.AppiumJvmTarget
|
|
7
11
|
import org.gradle.api.GradleException
|
|
12
|
+
import org.gradle.api.artifacts.component.ModuleComponentIdentifier
|
|
13
|
+
import org.gradle.api.attributes.Attribute
|
|
8
14
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
9
15
|
|
|
10
16
|
val appiumCompileSdk = project.property("appiumCompileSdk") as String
|
|
@@ -18,6 +24,12 @@ val appiumJvmTarget = project.property("appiumJvmTarget") as String
|
|
|
18
24
|
|
|
19
25
|
val useComposeLibrary: Boolean =
|
|
20
26
|
(findProperty("appiumComposeSupport") as String?)?.equals("false", ignoreCase = true) != true
|
|
27
|
+
val shadeServer: Boolean =
|
|
28
|
+
(findProperty("appiumShadeServer") as String?)?.equals("false", ignoreCase = true) != true
|
|
29
|
+
// Comma-separated group:module coordinates of the user's additional dependencies, kept unrelocated
|
|
30
|
+
val sharedCoordinates: Set<String> =
|
|
31
|
+
(findProperty("appiumSharedDependencies") as String?)?.split(",")?.map { it.trim() }
|
|
32
|
+
?.filter { it.isNotEmpty() }?.toSet() ?: emptySet()
|
|
21
33
|
|
|
22
34
|
android {
|
|
23
35
|
compileSdk = appiumCompileSdk.toInt()
|
|
@@ -46,6 +58,11 @@ android {
|
|
|
46
58
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
|
47
59
|
}
|
|
48
60
|
|
|
61
|
+
if (shadeServer) {
|
|
62
|
+
// Drops the library initializers whose classes are relocated
|
|
63
|
+
sourceSets.getByName("androidTest").manifest.srcFile("src/androidTestShaded/AndroidManifest.xml")
|
|
64
|
+
}
|
|
65
|
+
|
|
49
66
|
buildTypes {
|
|
50
67
|
getByName("release") {
|
|
51
68
|
isMinifyEnabled = false
|
|
@@ -79,7 +96,14 @@ android {
|
|
|
79
96
|
}
|
|
80
97
|
|
|
81
98
|
packaging {
|
|
82
|
-
|
|
99
|
+
if (shadeServer) {
|
|
100
|
+
// Only the service files stay (AGP merges the duplicates): the relocation task adds the ones
|
|
101
|
+
// of the relocated interfaces
|
|
102
|
+
// (a negated class excludes every META-INF folder that does not start with "s")
|
|
103
|
+
resources.excludes.addAll(listOf("META-INF/*", "META-INF/[!s]*/**", "META-INF/s[!e]*/**"))
|
|
104
|
+
} else {
|
|
105
|
+
resources.excludes.add("META-INF/**")
|
|
106
|
+
}
|
|
83
107
|
}
|
|
84
108
|
}
|
|
85
109
|
|
|
@@ -110,3 +134,69 @@ dependencies {
|
|
|
110
134
|
|
|
111
135
|
// additionalAndroidTestDependencies placeholder (don't change or delete this line)
|
|
112
136
|
}
|
|
137
|
+
|
|
138
|
+
if (shadeServer) {
|
|
139
|
+
val shadedPrefix = "io/appium/espressoserver/shaded/"
|
|
140
|
+
androidComponents {
|
|
141
|
+
onVariants { variant ->
|
|
142
|
+
val androidTest = variant.androidTest ?: return@onVariants
|
|
143
|
+
val suffix = variant.name.replaceFirstChar { it.uppercase() }
|
|
144
|
+
val relocateClasses = tasks.register<RelocateClassesTask>("relocate${suffix}AndroidTestClasses") {
|
|
145
|
+
prefix.set(shadedPrefix)
|
|
146
|
+
excludedResources.set(layout.buildDirectory.file("shade/$suffix/excluded-resources.txt"))
|
|
147
|
+
keep.set(
|
|
148
|
+
listOf(
|
|
149
|
+
// Server and the already shaded XPath 2 processor
|
|
150
|
+
"io/appium/",
|
|
151
|
+
// Package-private access between the runner and its superclass
|
|
152
|
+
"androidx/test/runner/",
|
|
153
|
+
"androidx/test/core/app/InstrumentationActivityInvoker",
|
|
154
|
+
),
|
|
155
|
+
)
|
|
156
|
+
shared.set(
|
|
157
|
+
// Compose test code needs the AUT's own Compose classes (static registries)
|
|
158
|
+
(if (useComposeLibrary) listOf("androidx/compose/", "kotlin/", "kotlinx/") else emptyList()) +
|
|
159
|
+
// The AUT implements IdlingResource and registers it in the IdlingRegistry singleton
|
|
160
|
+
listOf(
|
|
161
|
+
"androidx/test/espresso/IdlingResource",
|
|
162
|
+
"androidx/test/espresso/IdlingRegistry",
|
|
163
|
+
"androidx/test/espresso/idling/",
|
|
164
|
+
),
|
|
165
|
+
)
|
|
166
|
+
sharedExclude.set(listOf("androidx/compose/ui/test/"))
|
|
167
|
+
if (sharedCoordinates.isNotEmpty()) {
|
|
168
|
+
userJars.from(
|
|
169
|
+
androidTest.runtimeConfiguration.incoming.artifactView {
|
|
170
|
+
attributes {
|
|
171
|
+
attribute(Attribute.of("artifactType", String::class.java), "android-classes-jar")
|
|
172
|
+
}
|
|
173
|
+
lenient(true)
|
|
174
|
+
componentFilter { id ->
|
|
175
|
+
id is ModuleComponentIdentifier && "${id.group}:${id.module}" in sharedCoordinates
|
|
176
|
+
}
|
|
177
|
+
}.files,
|
|
178
|
+
)
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
androidTest.artifacts.forScope(ScopedArtifacts.Scope.ALL)
|
|
182
|
+
.use(relocateClasses)
|
|
183
|
+
.toTransform(
|
|
184
|
+
ScopedArtifact.CLASSES,
|
|
185
|
+
RelocateClassesTask::allJars,
|
|
186
|
+
RelocateClassesTask::allDirectories,
|
|
187
|
+
RelocateClassesTask::output,
|
|
188
|
+
)
|
|
189
|
+
// Rewritten service files of the relocated interfaces replace the originals, which list
|
|
190
|
+
// providers that no longer exist under these names
|
|
191
|
+
androidTest.sources.resources?.addGeneratedSourceDirectory(relocateClasses, RelocateClassesTask::servicesDir)
|
|
192
|
+
tasks.matching { it.name == "merge${suffix}AndroidTestJavaResource" }.configureEach {
|
|
193
|
+
val excluded = relocateClasses.flatMap { it.excludedResources }
|
|
194
|
+
inputs.file(excluded)
|
|
195
|
+
doLast {
|
|
196
|
+
val names = excluded.get().asFile.readLines().filter(String::isNotBlank).toSet()
|
|
197
|
+
outputs.files.filter { it.name.endsWith(".jar") }.forEach { removeJarEntries(it, names) }
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
3
|
+
xmlns:tools="http://schemas.android.com/tools">
|
|
4
|
+
|
|
5
|
+
<!-- Library manifests merge these in. The server relocates their classes, so the test
|
|
6
|
+
package's own process would crash on them. The instrumentation does not need them. -->
|
|
7
|
+
<application>
|
|
8
|
+
<provider
|
|
9
|
+
android:name="androidx.startup.InitializationProvider"
|
|
10
|
+
android:authorities="${applicationId}.androidx-startup"
|
|
11
|
+
tools:node="remove" />
|
|
12
|
+
<receiver
|
|
13
|
+
android:name="androidx.profileinstaller.ProfileInstallReceiver"
|
|
14
|
+
tools:node="remove" />
|
|
15
|
+
</application>
|
|
16
|
+
</manifest>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#
|
|
1
|
+
#Wed Nov 18 08:53:27 UTC 2026
|
|
2
2
|
gradle.version=9.7.1
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|