Test artifacts monorepo

README.md

@@ -268,11 +268,11 @@ gcloud:
   ## The path to the application binary file.
   ## The path may be in the local filesystem or in Google Cloud Storage using gs:// notation.
   ## Android App Bundles are specified as .aab, all other files are assumed to be APKs.
-  app: ../test_app/apks/app-debug.apk
+  app: ../test_projects/android/apks/app-debug.apk
 
   ## The path to the binary file containing instrumentation tests.
   ## The given path may be in the local filesystem or in Google Cloud Storage using a URL beginning with gs://.
-  test: ../test_app/apks/app-debug-androidTest.apk
+  test: ../test_projects/android/apks/app-debug-androidTest.apk
 
   ## Automatically log into the test device using a preconfigured Google account before beginning the test.
   ## Disabled by default. Use --auto-google-login to enable.
@@ -404,9 +404,9 @@ flank:
   ## Include additional app/test apk pairs in the run. Apks are unique by just filename and not by path!
   ## If app is omitted, then the top level app is used for that pair.
   # additional-app-test-apks:
-  #  - app: ../test_app/apks/app-debug.apk
-  #    test: ../test_app/apks/app1-debug-androidTest.apk
-  #  - test: ../test_app/apks/app2-debug-androidTest.apk
+  #  - app: ../test_projects/android/apks/app-debug.apk
+  #    test: ../test_projects/android/apks/app1-debug-androidTest.apk
+  #  - test: ../test_projects/android/apks/app2-debug-androidTest.apk
 
   ## The max time this test run can execute before it is cancelled (default: unlimited).
   # run-timeout: 60m
@@ -577,8 +577,8 @@ In CI, it may be useful to generate the file via a shell script:
 ```
 cat << 'EOF' > ./flank.yml
 gcloud:
-  app: ../../test_app/apks/app-debug.apk
-  test: ../../test_app/apks/app-debug-androidTest.apk
+  app: ../../test_projects/android/apks/app-debug.apk
+  test: ../../test_projects/android/apks/app-debug-androidTest.apk
 EOF
 ```
 

docs/onboarding/1_environment_setup.md

@@ -3,14 +3,14 @@ This document may be incomplete now or in the future, so if you faced any proble
 
 ### Mac
 1. Install a brew, it's not mandatory but may be convenient for installing other software.
-1. Currently, the zsh is default shell on a mac. If you prefer bash use `chsh -s /bin/bash`.  
+1. Currently, the zsh is the default shell on a mac. If you prefer bash use `chsh -s /bin/bash`.  
 
 ### Env config
 Bunch of useful exports. You can paste them to your `.bashrc`
 ```bash
 FLANK_REPO="type path to your local flank repository"
 export PATH=$PATH:$HOME/$FLANK_REPO/flank/test_runner/bash
-export PATH=$PATH:$HOME/$FLANK_REPO/flank/test_app/bash
+export PATH=$PATH:$HOME/$FLANK_REPO/flank/test_projects/android/bash
 export PATH=$PATH:$HOME/Library/Android/sdk/platform-tools
 export PATH=$PATH:$HOME/Library/Python/2.7/bin
 #export PATH=$PATH:$HOME/"path to your local gcloud repository"/gcloud_cli/google-cloud-sdk/bin

release_notes.md

@@ -11,7 +11,7 @@
 - [#906](https://github.com/Flank/flank/pull/909) Added option to print iOS and Android screen orientations. ([adamfilipow92](https://github.com/adamfilipow92))
 - [#907](https://github.com/Flank/flank/pull/907) Added option to print Android available locales to test against. ([piotradamczyk5](https://github.com/piotradamczyk5))
 - [#913](https://github.com/Flank/flank/pull/913) Add Gradle Enterprise API example. ([pawelpasterz](https://github.com/pawelpasterz))
--
+- [#916](https://github.com/Flank/flank/pull/916) Test artifacts monorepo. ([jan-gogo](https://github.com/jan-gogo))
 -
 
 ## v20.07.0

test_app/bash/generate-multi-modules-apks.sh → test_projects/android/bash/generate-multi-modules-apks.sh

@@ -2,9 +2,9 @@
 
 set -euxo pipefail
 
-PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." >/dev/null 2>&1 && pwd )"
+PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../.." >/dev/null 2>&1 && pwd )"
 
-TEST_APP_DIR="$PROJECT_DIR/test_app"
+TEST_APP_DIR="$PROJECT_DIR/test_projects/android"
 MULTI_MODULES_DIR="$PROJECT_DIR/test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/multi-modules/"
 
 "$TEST_APP_DIR/gradlew" :multi-modules:multiapp:assemble \
@@ -30,4 +30,4 @@ MULTI_MODULES_DIR="$PROJECT_DIR/test_runner/src/test/kotlin/ftl/fixtures/tmp/apk
   :multi-modules:testModule20:assembleAndroidTest \
 
 mkdir -p "$MULTI_MODULES_DIR"
-find multi-modules -type f -name "*.apk" -exec cp {} "$MULTI_MODULES_DIR" \;
+find multi-modules -type f -name "*.apk" -exec cp {} "$MULTI_MODULES_DIR" \;

test_app/bash/generate_duplicated_names_apks.sh → test_projects/android/bash/generate_duplicated_names_apks.sh

@@ -12,7 +12,7 @@ TEST_APP_DIR="$DIR/.."
   dir2:testModule:assembleAndroidTest \
   dir3:testModule:assembleAndroidTest \
 
-APKS_DIR="$TEST_APP_DIR/../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/duplicated_names"
+APKS_DIR="$TEST_APP_DIR/../../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/duplicated_names"
 for INDEX in 0 1 2 3
 do
   DIR_NAME="dir$INDEX"

test_projects/android/gradle.properties

@@ -0,0 +1,15 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2560m
+kotlin.code.style=official
+org.gradle.parallel=true
+

test_projects/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists