Remove crypto variant

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayDevTchapRustCryptoWithoutvoipWithoutpinning, FdroidDevTchapRustCryptoWithoutvoipWithoutpinning, GplayBtchapRustCryptoWithvoipWithpinning ]
+        target: [ GplayDevTchapWithoutvoipWithoutpinning, FdroidDevTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ]
     # Allow all jobs on develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref)  }}
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapRustCryptoWithoutvoipWithpinning, GplayTchapRustCryptoWithoutvoipWithpinning, FdroidBtchapRustCryptoWithoutvoipWithoutpinning, FdroidTchapRustCryptoWithoutvoipWithoutpinning, GplayBtchapRustCryptoWithvoipWithpinning ]
+        target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ]
     concurrency:
       # Tchap: custom group
       group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}-{1}', github.sha, matrix.target) || startsWith(github.ref, 'refs/tags/tchap_v') && format('build-release-apk-tag-{0}-{1}', github.sha, matrix.target) }}
@@ -68,15 +68,9 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
-<<<<<<< HEAD
       - name: Assemble ${{ matrix.target }} unsigned apk
         run: ./gradlew clean assemble${{ matrix.target }}Release $CI_GRADLE_ARG_PROPERTIES
       - name: Upload ${{ matrix.target }} unsigned APKs
-=======
-      - name: Assemble GPlay unsigned apk
-        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload Gplay unsigned APKs
->>>>>>> v1.6.8
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.target }}-release-unsigned
@@ -88,8 +82,8 @@ jobs:
     needs: release
     env:
       # Tchap: only generate exodus report for the following target
-      TARGET_NAME: "GplayTchapRustCryptoWithoutvoipWithpinning"
-      TARGET_FOLDER: "gplayTchapRustCryptoWithoutvoipWithpinning"
+      TARGET_NAME: "GplayTchapWithoutvoipWithpinning"
+      TARGET_FOLDER: "gplayTchapWithoutvoipWithpinning"
     steps:
       - name: Obtain apk from artifact
         id: download
@@ -105,11 +99,7 @@ jobs:
       - name: Execute exodus-standalone
         uses: docker://exodusprivacy/exodus-standalone:latest
         with:
-<<<<<<< HEAD
           args: /github/workspace/${{ env.TARGET_FOLDER }}/release/${{ steps.list-apks.outputs.FIRST_APK_NAME }} -j -o /github/workspace/exodus.json
-=======
-          args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json
->>>>>>> v1.6.8
       - name: Upload exodus json report
         uses: actions/upload-artifact@v3
         with:

.github/workflows/quality.yml

@@ -55,13 +55,8 @@ jobs:
       - name: Run lint
         # Not always, if ktlint or detekt fail, avoid running the long lint check.
         run: |
-<<<<<<< HEAD
-          ./gradlew vector-app:lintGplayBtchapRustCryptoWithoutvoipWithpinningRelease $CI_GRADLE_ARG_PROPERTIES
-          ./gradlew vector-app:lintFdroidBtchapRustCryptoWithoutvoipWithoutpinningRelease $CI_GRADLE_ARG_PROPERTIES
-=======
-          ./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
-          ./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
->>>>>>> v1.6.8
+          ./gradlew vector-app:lintGplayBtchapWithoutvoipWithpinningRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew vector-app:lintFdroidBtchapWithoutvoipWithoutpinningRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload reports
         if: always()
         uses: actions/upload-artifact@v3

.github/workflows/sanity_test.yml

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

.github/workflows/tests.yml

@@ -61,27 +61,6 @@ jobs:
           disableRateLimiting: true
           public_baseurl: "http://10.0.2.2:8080/"
 
-<<<<<<< HEAD
-      ###- name: Run all the codecoverage tests at once
-      ###  uses: reactivecircus/android-emulator-runner@v2
-      ###  # continue-on-error: true
-      ###  with:
-      ###    api-level: ${{ matrix.api-level }}
-      ###    arch: x86
-      ###    profile: Nexus 5X
-      ###    target: playstore
-      ###    force-avd-creation: false
-      ###    emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-      ###    disable-animations: true
-      ###    # emulator-build: 7425822
-      ###    script: |
-      ###      # Tchap : comment this task because CI failed
-      ###      # ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
-      ###      # ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-      ###      ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-      ###      ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-
-=======
       - name: Run all the codecoverage tests at once
         uses: reactivecircus/android-emulator-runner@v2
         # continue-on-error: true
@@ -99,7 +78,6 @@ jobs:
             ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
             ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
             ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
->>>>>>> v1.6.8
       # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves steps.tests.outcome = 'failure'
       ### - name: Run all the codecoverage tests at once (retry if emulator failed)
       ###   uses: reactivecircus/android-emulator-runner@v2

build.gradle

@@ -310,18 +310,10 @@ tasks.register("recordScreenshots", GradleBuild) {
     tasks = [':vector:recordPaparazziDebug']
 }
 
-<<<<<<< HEAD
-// Tchap: remove task not found
-//tasks.register("verifyScreenshots", GradleBuild) {
-//    startParameter.projectProperties.screenshot = ""
-//    tasks = [':vector:verifyPaparazziDebug']
-//}
-=======
 tasks.register("verifyScreenshots", GradleBuild) {
     startParameter.projectProperties.screenshot = ""
     tasks = [':vector:verifyPaparazziDebug']
 }
->>>>>>> v1.6.8
 
 ext.initScreenshotTests = { project ->
     def hasScreenshots = project.hasProperty("screenshot")

coverage.gradle

@@ -88,15 +88,5 @@ task unitTestsWithCoverage(type: GradleBuild) {
 task instrumentationTestsWithCoverage(type: GradleBuild) {
     startParameter.projectProperties.coverage = "true"
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-<<<<<<< HEAD
-    tasks = [':vector-app:connectedGplayKotlinCryptoDebugAndroidTest', ':vector:connectedKotlinCryptoDebugAndroidTest'/*, 'matrix-sdk-android:connectedKotlinCryptoDebugAndroidTest'*/]
-}
-
-task instrumentationTestsRustWithCoverage(type: GradleBuild) {
-    startParameter.projectProperties.coverage = "true"
-    startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector-app:connectedGplayRustCryptoDebugAndroidTest', ':vector:connectedRustCryptoDebugAndroidTest'/*, 'matrix-sdk-android:connectedRustCryptoDebugAndroidTest'*/]
-=======
-    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
->>>>>>> v1.6.8
+    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest'/*, 'matrix-sdk-android:connectedDebugAndroidTest'*/]
 }