Revert "Rename Preprod flavour to Btchap"

This reverts commit cb788d4.

Conflicts:
	vector/src/gplay/preprod/google-services.json

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, FdroidPreprodWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, GplayAgentWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidAgentWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, GplayAgentWithoutvoipWithpinning, FdroidPreprodWithoutvoipWithoutpinning, FdroidAgentWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

.github/workflows/integration.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, FdroidPreprodWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

.github/workflows/quality.yml

@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, FdroidPreprodWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

.github/workflows/sanity_test.yml

@@ -68,7 +68,7 @@ jobs:
             touch emulator.log
             chmod 777 emulator.log
             adb logcat >> emulator.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayBtchapWithoutvoipWithpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayPreprodWithoutvoipWithoutpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
       - name: Upload Failing Test Report Log
         uses: actions/upload-artifact@v2
         if: failure()

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Run unit tests
-        run: ./gradlew clean TestGplayBtchapWithoutvoipWithpinningDebugUnitTest $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false --stacktrace
+        run: ./gradlew clean TestGplayPreprodWithoutvoipWithoutpinningDebugUnitTest $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false --stacktrace
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         if: always() &&

CONTRIBUTING.md

@@ -91,16 +91,16 @@ For ktlint to fix some detected errors for you (you still have to check and comm
 #### lint
 
 <pre>
-./gradlew lintGplayBtchapWithoutvoipWithpinningRelease
-./gradlew lintFdroidBtchapWithoutvoipWithoutpinningRelease
+./gradlew lintGplayPreprodWithoutvoipWithoutpinningRelease
+./gradlew lintFdroidPreprodWithoutvoipWithoutpinningRelease
 </pre>
 
 ### Unit tests
 
 Make sure the following commands execute without any error:
 
 <pre>
-./gradlew testGplayBtchapWithoutvoipWithpinningReleaseUnitTest
+./gradlew testGplayPreprodWithoutvoipWithoutpinningReleaseUnitTest
 </pre>
 
 ### Tests

docs/ui-tests.md

@@ -60,7 +60,7 @@ Click on the green arrow in front of each test. Clicking on the arrow in front o
 ### From command line
 
 ````shell script
-./gradlew vector:connectedGplayBtchapWithoutvoipWithpinningDebugAndroidTest
+./gradlew vector:connectedGplayPreprodWithoutvoipWithoutpinningDebugAndroidTest
 ````
 
 To run all the tests from the `vector` module.

vector/build.gradle

@@ -311,7 +311,7 @@ android {
             dimension "pinning"
         }
 
-        btchap {
+        preprod {
             dimension "target"
 
             resValue "string", "app_name", "Btchap"