diff --git a/README.md b/README.md index 050e5460..90a5fe0d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ It is currently being used at [CyberAgent](https://www.cyberagent.co.jp/en/) to * OS support - Android - * Supports versions 2.3.3 (SDK level 10) to 5.1 (SDK level 22), plus Android M Developer Preview + * Supports versions 2.3.3 (SDK level 10) to 5.1 (SDK level 22), plus Android M Developer Preview 3 * Supports Wear 5.1 (but not 5.0 due to missing permissions) * Supports Fire OS, CyanogenMod, and other heavily Android based distributions * `root` is **not** required for any current functionality diff --git a/lib/units/device/resources/service.js b/lib/units/device/resources/service.js index 09d89a50..657f82a8 100644 --- a/lib/units/device/resources/service.js +++ b/lib/units/device/resources/service.js @@ -17,7 +17,7 @@ module.exports = syrup.serial() pathutil.vendor('STFService/wire.proto')) var resource = { - requiredVersion: '1.0.1' + requiredVersion: '1.0.2' , pkg: 'jp.co.cyberagent.stf' , main: 'jp.co.cyberagent.stf.Agent' , apk: pathutil.vendor('STFService/STFService.apk') @@ -79,9 +79,9 @@ module.exports = syrup.serial() .then(function() { return promiseutil.periodicNotify( adb.install(options.serial, resource.apk) - , 10000 + , 20000 ) - .timeout(60000) + .timeout(65000) }) .progressed(function() { log.warn( diff --git a/vendor/STFService/STFService.apk b/vendor/STFService/STFService.apk index 322bf510..1b5eaf8e 100644 Binary files a/vendor/STFService/STFService.apk and b/vendor/STFService/STFService.apk differ diff --git a/vendor/minicap/shared/android-M/arm64-v8a/minicap.so b/vendor/minicap/shared/android-23/arm64-v8a/minicap.so similarity index 100% rename from vendor/minicap/shared/android-M/arm64-v8a/minicap.so rename to vendor/minicap/shared/android-23/arm64-v8a/minicap.so diff --git a/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-23/armeabi-v7a/minicap.so similarity index 100% rename from vendor/minicap/shared/android-M/armeabi-v7a/minicap.so rename to vendor/minicap/shared/android-23/armeabi-v7a/minicap.so diff --git a/vendor/minicap/shared/android-M/x86/minicap.so b/vendor/minicap/shared/android-23/x86/minicap.so similarity index 100% rename from vendor/minicap/shared/android-M/x86/minicap.so rename to vendor/minicap/shared/android-23/x86/minicap.so diff --git a/vendor/minicap/shared/android-M/x86_64/minicap.so b/vendor/minicap/shared/android-23/x86_64/minicap.so similarity index 100% rename from vendor/minicap/shared/android-M/x86_64/minicap.so rename to vendor/minicap/shared/android-23/x86_64/minicap.so