Merge pull request #15 from risinek/update-android-11-support

ANDROID-4181 Update android 11 support

Author: jojand

.github/ISSUE_TEMPLATE/feature_request.md

@@ -15,6 +15,3 @@ A clear and concise description of any alternative solutions or features you've
 
 **Additional context**
 Add any other context or screenshots about the feature request here.
-
-<!-- Love OpenSTF? Please consider supporting our collective:
-	👉  https://opencollective.com/openstf/donate -->

.semaphore/deploy_dockerhub.yml

@@ -0,0 +1,21 @@
+version: v1.0
+name: Deploy to DockerHub
+blocks:
+  - name: Deploy to DockerHub
+    task:
+      jobs:
+        - name: Deploy
+          commands:
+            - checkout
+            - 'docker build . -t "devicefarmer/stf:$(echo ${SEMAPHORE_GIT_TAG_NAME:-vlatest} |cut -c 2-)"'
+            - docker push devicefarmer/stf
+      secrets:
+        - name: dockerhub-secrets
+      prologue:
+        commands:
+          - 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin'
+    dependencies: []
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804

.semaphore/deploy_npmjs.yml

@@ -0,0 +1,19 @@
+version: v1.0
+name: Deploy to npmjs
+blocks:
+  - name: Deploy to npmjs
+    task:
+      jobs:
+        - name: Deploy
+          commands:
+            - install-package libzmq3-dev libprotobuf-dev graphicsmagick yasm gulp
+            - sem-version node 8.16.1
+            - checkout
+            - npm install
+            - npm publish --access=public
+      secrets:
+        - name: npmjs
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804

.semaphore/semaphore.yml

@@ -0,0 +1,43 @@
+version: v1.0
+name: Docker
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+blocks:
+  - name: Build Standard Docker image
+    task:
+      jobs:
+        - name: docker build
+          commands:
+            - checkout
+            - docker build .
+    dependencies: []
+  - name: Build npm package
+    dependencies: []
+    task:
+      jobs:
+        - name: npm test
+          commands:
+            - install-package libzmq3-dev libprotobuf-dev graphicsmagick yasm gulp
+            - sem-version node 8.16.1
+            - checkout
+            - npm install
+            - npm test
+  - name: Build Debian Docker image
+    dependencies: []
+    task:
+      jobs:
+        - name: docker build
+          commands:
+            - checkout
+            - docker build . -f Dockerfile-debian-x86_64
+promotions:
+  - name: Deploy to DockerHub
+    pipeline_file: deploy_dockerhub.yml
+    auto_promote:
+      when: (branch = 'master' OR tag =~ '.*') AND result = 'passed'
+  - name: Deploy to npmjs
+    pipeline_file: deploy_npmjs.yml
+    auto_promote:
+      when: tag =~ '.*' AND result = 'passed'

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## 3.5.0 (2020-10-18)
+
+### Fixes
+
+- Update dependency versions
+- Fix minicap disconnection on getting file [#97](https://github.com/DeviceFarmer/stf/pull/97)
+- Fix icons displaying [#59](https://github.com/DeviceFarmer/stf/pull/59). Thanks @Cookies52!
+
+### Enhancements
+
+- Add .aab installation support [#103](https://github.com/DeviceFarmer/stf/pull/103). Thanks @nghiaviminh!
+- Change jpeg-turbo dependency to `@julusian/jpeg-turbo` [#90](https://github.com/DeviceFarmer/stf/pull/90)
+- Add Android 11 support
+
+## 3.4.3 (2020-07-21)
+
+### Misc
+
+- Changed dependencies to equivalents using **@devicefarmer** scope
+
+## 3.4.2 (2020-05-31)
+
+### Fixes
+
+- Fixed SAML_ID_PROVIDER_CERT_PATH in example SAML auth provider unit [#1061](https://github.com/openstf/stf/pull/1061). Thanks @mitchtech!
+- Fixed Chinese characters handling [#1204](https://github.com/openstf/stf/pull/1204). Thanks @xu-duqing!
+
+### Enhancements
+
+- Updated STFService.apk, minitouch and minicap to support Android 10. Thanks @denis99999 and @pcrepieux!
+- Added addAdbPublicKey endpoint [#770](https://github.com/openstf/stf/pull/770). Thanks @neofreko!
+- Added pt_BR translation [#1038](https://github.com/openstf/stf/pull/1038). Thanks @esmiralha!
+- Added market name to device properties [#1002](https://github.com/openstf/stf/pull/1002).
+- Added [group feature](https://github.com/openstf/stf/blob/master/doc/GroupFeature.pdf) [#1056](https://github.com/openstf/stf/pull/1056). Thanks @denis99999!
+- Added validation for filter.pid/ filter.tid/ filter.data input objects [#1074](https://github.com/openstf/stf/pull/1074). Thanks @lukzeg!
+- Added opening device view via reselecting device from device view [#1077](https://github.com/openstf/stf/pull/1077). Thanks @lukzeg!
+ - Added device logs separation [#1095](https://github.com/openstf/stf/pull/1095). Thanks @lukzeg!
+ - Updated NodeJS to 8.9.3 [#1169](https://github.com/openstf/stf/pull/1169).
+ - Added alternative dockerfiles for armhf and x86_64 architectures [#1174](https://github.com/openstf/stf/pull/1174), [#1191](https://github.com/openstf/stf/pull/1191). Thanks @denis99999 and @petemyron!
+ - Added touchMove error handling [#1189](https://github.com/openstf/stf/pull/1189). Thanks @att55!
+ 
+
 ## 3.4.1 (2019-05-03)
 
 ### Fixes

Dockerfile

@@ -32,16 +32,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     tar -xJf node-v*.tar.xz --strip-components 1 -C /usr/local && \
     rm node-v*.tar.xz && \
     su stf-build -s /bin/bash -c '/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js install' && \
-    apt-get -y install libzmq3-dev libprotobuf-dev git graphicsmagick yasm && \
+    apt-get -y install libzmq3-dev libprotobuf-dev git graphicsmagick openjdk-8-jdk yasm && \
     apt-get clean && \
-    rm -rf /var/cache/apt/* /var/lib/apt/lists/*
+    rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \
+    mkdir /tmp/bundletool && \
+    cd /tmp/bundletool && \
+    wget --progress=dot:mega \
+      https://github.com/google/bundletool/releases/download/1.2.0/bundletool-all-1.2.0.jar && \
+    mv bundletool-all-1.2.0.jar bundletool.jar
 
 # Copy app source.
 COPY . /tmp/build/
 
 # Give permissions to our build user.
 RUN mkdir -p /app && \
-    chown -R stf-build:stf-build /tmp/build /app
+    chown -R stf-build:stf-build /tmp/build /tmp/bundletool /app
 
 # Switch over to the build user.
 USER stf-build
@@ -52,13 +57,15 @@ RUN set -x && \
     export PATH=$PWD/node_modules/.bin:$PATH && \
     npm install --loglevel http && \
     npm pack && \
-    tar xzf stf-*.tgz --strip-components 1 -C /app && \
+    tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
     bower cache clean && \
     npm prune --production && \
     mv node_modules /app && \
     rm -rf ~/.node-gyp && \
+    mkdir /app/bundletool && \
+    mv /tmp/bundletool/* /app/bundletool && \
     cd /app && \
-    rm -rf /tmp/*
+    find /tmp -mindepth 1 ! -regex '^/tmp/hsperfdata_root\(/.*\)?' -delete
 
 # Switch to the app user.
 USER stf

Dockerfile-debian-armhf

@@ -6,7 +6,7 @@ FROM arm32v7/debian:stretch-slim
 
 LABEL Maintainer="Denis Barbaron <denis.barbaron@orange.com>"
 LABEL Name="STF"
-LABEL Url="https://github.com/openstf/stf/"
+LABEL Url="https://github.com/devicefarmer/stf/"
 LABEL Description="STF docker image for armhf architecture"
 
 # Sneak the stf executable into $PATH.
@@ -23,7 +23,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     echo '--- Updating repositories' && \
     apt-get update && \
     echo '--- Building node' && \
-    apt-get -y install wget python build-essential && \
+    apt-get -y install wget python build-essential cmake && \
     cd /tmp && \
     wget --progress=dot:mega \
       https://nodejs.org/dist/v9.9.0/node-v9.9.0-linux-armv7l.tar.xz && \
@@ -42,12 +42,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     cd /tmp/build && \
     export PATH=$PWD/node_modules/.bin:$PATH && \
     sed -i'' -e '/phantomjs/d' package.json && \
+    npm config set unsafe-perm true && \
     npm install -g npm && \
     echo 'npm cache clean --force' | su stf -s /bin/bash && \
     echo 'npm install --no-optional --loglevel http' | su stf -s /bin/bash && \
     echo '--- Assembling app' && \
     echo 'npm pack' | su stf -s /bin/bash && \
-    tar xzf stf-*.tgz --strip-components 1 -C /app && \
+    tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
     echo '/tmp/build/node_modules/.bin/bower cache clean' | su stf -s /bin/bash && \
     echo 'npm prune --production' | su stf -s /bin/bash && \
     mv node_modules /app && \

Dockerfile-debian-x86_64

@@ -6,7 +6,7 @@ FROM debian:stretch-slim
 
 LABEL Maintainer="Denis Barbaron <denis.barbaron@orange.com>"
 LABEL Name="STF"
-LABEL Url="https://github.com/openstf/stf/"
+LABEL Url="https://github.com/devicefarmer/stf/"
 LABEL Description="STF docker image for x86_64 architecture"
 
 # Sneak the stf executable into $PATH.
@@ -46,7 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     echo 'npm install --no-optional --loglevel http' | su stf -s /bin/bash && \
     echo '--- Assembling app' && \
     echo 'npm pack' | su stf -s /bin/bash && \
-    tar xzf stf-*.tgz --strip-components 1 -C /app && \
+    tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
     echo '/tmp/build/node_modules/.bin/bower cache clean' | su stf -s /bin/bash && \
     echo 'npm prune --production' | su stf -s /bin/bash && \
     mv node_modules /app && \

README.md

@@ -1,26 +1,16 @@
 <img src="res/common/logo/exports/STF-128.png?raw=true" style="width:100px;height:100px;" alt="STF">
 
-[![Build Status](https://travis-ci.org/WanderaOrg/stf.svg?branch=master)](https://travis-ci.org/WanderaOrg/stf)
-[![Docker Pulls](https://img.shields.io/docker/pulls/wanderadock/stf.svg)](https://hub.docker.com/r/wanderadock/stf/)
-[![NPM version](https://img.shields.io/npm/v/stf.svg)](https://www.npmjs.com/package/stf)
+[![Build Status](https://travis-ci.org/DeviceFarmer/stf.svg?branch=master&status=created)](https://travis-ci.org/github/DeviceFarmer/stf)
+[![Docker Pulls](https://img.shields.io/docker/pulls/devicefarmer/stf.svg)](https://hub.docker.com/r/devicefarmer/stf/)
+[![npm](https://img.shields.io/npm/v/@devicefarmer/stf)](https://www.npmjs.com/package/@devicefarmer/stf)
 
 **STF** (or Smartphone Test Farm) is a web application for debugging smartphones, smartwatches and other gadgets remotely, from the comfort of your browser.
 
-This is a fork of a original repository located at [https://github.com/openstf/stf](https://github.com/openstf/stf) adding Wandera specific features,
-STF was originally developed at [CyberAgent](https://www.cyberagent.co.jp/en/) to control a growing collection of more than 160 devices. As of July 2016 development is mainly sponsored by [HeadSpin](https://performance.headspin.io/) and [other individual contributors](https://opencollective.com/openstf).
+## Overview
 
-![Close-up of device shelf](doc/shelf_closeup_790x.jpg?raw=true)
+![Close-up of device shelf](doc/shelf_closeup_790x.jpg)
 
-![Super short screencast showing usage](doc/7s_usage.gif?raw=true)
-
-### Contributors
-Thank you to all the people who have already contributed to STF!
-<a href="../../graphs/contributors"><img src="https://opencollective.com/openstf/contributors.svg?width=890" /></a>
-
-### Backers
-Thank you to all our backers! [[Become a backer](https://opencollective.com/openstf#backer)]
-
-<a href="https://opencollective.com/openstf#backers" target="_blank"><img src="https://opencollective.com/openstf/backers.svg?width=890"></a>
+![Super short screencast showing usage](doc/7s_usage.gif)
 
 ## Features
 

doc/CREDITS.md

@@ -0,0 +1,44 @@
+# Credits
+
+## History
+
+### OpenSTF
+
+STF was originally developed at [CyberAgent](https://www.cyberagent.co.jp/en/) to control a growing collection of more than 160 devices. As of July 2016 development is mainly sponsored by [HeadSpin](https://performance.headspin.io/) and [other individual contributors](https://opencollective.com/openstf).
+
+List of financial contributions to OpenSTF is available on [open collective](https://opencollective.com/openstf).
+
+[![Backers on Open Collective](https://opencollective.com/openstf/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/openstf/sponsors/badge.svg)](#sponsors)
+
+### Sponsors
+
+Thank you to all our sponsors!
+
+#### Gold Sponsor
+
+[<img src="https://raw.githubusercontent.com/DeviceFarmer/stf/master/doc/sponsors/headspin-wordmark-orange.png?raw=true" alt="HeadSpin" width="400">](https://ui.headspin.io/register?referral=start-testing-hs)
+
+> [HeadSpin](https://headspin.io/) provides secure and scalable STF for iOS integrated with Appium/XCTest/Selenium/Espresso, High speed interaction Audio/Video/Game testing and AI based Root cause analysis for Performance Management. It's free to start using HeadSpin in 150+ locations worldwide! [Try it out for free.](https://ui.headspin.io/register?referral=start-testing-hs)
+
+HeadSpin offers a generous monthly contribution towards STF development.
+
+### Contributors
+Thank you to all the people who have already contributed to STF!
+<img src="https://opencollective.com/openstf/contributors.svg?width=890" />
+
+### Backers
+Thank you to all our backers!
+
+<a href="https://opencollective.com/openstf#backers" target="_blank"><img src="https://opencollective.com/openstf/backers.svg?width=890"></a>
+
+
+### Sponsors
+
+DeviceFarmer currently does not have open sponsorship opportunities.
+
+OpenSTF sponsorship report is available on on [open collective](https://opencollective.com/openstf) and
+ (in case of hardware-only contributions) in [donation transparency report](DONATION-TRANSPARENCY.md).
+
+### Consulting services
+
+DeviceFarmer does not provide consulting services other than community issue trackers.