From e64d83426403e1be09e6a846d1816006b65f76a2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 3 May 2023 11:55:44 +0200 Subject: [PATCH] Rust Crypto SDK is now the default, and the build will replace the existing application. --- .github/workflows/build.yml | 6 +-- .github/workflows/nightly.yml | 2 +- build.gradle | 2 +- docs/nightly_build.md | 2 +- flavor.gradle | 2 +- vector-app/build.gradle | 8 ++-- .../debug/google-services.json | 40 ------------------- .../nightly/google-services.json | 40 ------------------- .../release/google-services.json | 40 ------------------- .../res/values/colors.xml | 4 -- 10 files changed, 11 insertions(+), 135 deletions(-) delete mode 100644 vector-app/src/gplayRustCrypto/debug/google-services.json delete mode 100644 vector-app/src/gplayRustCrypto/nightly/google-services.json delete mode 100644 vector-app/src/gplayRustCrypto/release/google-services.json delete mode 100644 vector-app/src/gplayRustCryptoNightly/res/values/colors.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 985da7d83a..319acb2160 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: with: cache-read-only: ${{ github.ref != 'refs/heads/develop' }} - name: Assemble ${{ matrix.target }} debug apk - run: ./gradlew assemble${{ matrix.target }}KotlinCryptoDebug $CI_GRADLE_ARG_PROPERTIES + run: ./gradlew assemble${{ matrix.target }}RustCryptoDebug $CI_GRADLE_ARG_PROPERTIES - name: Upload ${{ matrix.target }} debug APKs uses: actions/upload-artifact@v3 with: @@ -57,7 +57,7 @@ jobs: with: cache-read-only: ${{ github.ref != 'refs/heads/develop' }} - name: Assemble GPlay unsigned apk - run: ./gradlew clean assembleGplayKotlinCryptoRelease $CI_GRADLE_ARG_PROPERTIES + run: ./gradlew clean assembleGplayRustCryptoRelease $CI_GRADLE_ARG_PROPERTIES - name: Upload Gplay unsigned APKs uses: actions/upload-artifact@v3 with: @@ -79,7 +79,7 @@ jobs: - name: Execute exodus-standalone uses: docker://exodusprivacy/exodus-standalone:latest with: - args: /github/workspace/gplayKotlinCrypto/release/vector-gplay-kotlinCrypto-universal-release-unsigned.apk -j -o /github/workspace/exodus.json + args: /github/workspace/gplayRustCrypto/release/vector-gplay-kotlinRust-universal-release-unsigned.apk -j -o /github/workspace/exodus.json - name: Upload exodus json report uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 62e169e49f..7c509218b0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -34,7 +34,7 @@ jobs: yes n | towncrier build --version nightly - name: Build and upload Gplay Nightly APK run: | - ./gradlew assembleGplayKotlinCryptoNightly appDistributionUploadGplayKotlinCryptoNightly $CI_GRADLE_ARG_PROPERTIES + ./gradlew assembleGplayRustCryptoNightly appDistributionUploadGplayRustCryptoNightly $CI_GRADLE_ARG_PROPERTIES env: ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }} ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }} diff --git a/build.gradle b/build.gradle index 7d7f132e95..3060747977 100644 --- a/build.gradle +++ b/build.gradle @@ -323,7 +323,7 @@ tasks.register("recordScreenshots", GradleBuild) { tasks.register("verifyScreenshots", GradleBuild) { startParameter.projectProperties.screenshot = "" - tasks = [':vector:verifyPaparazziKotlinCryptoDebug'] + tasks = [':vector:verifyPaparazziRustCryptoDebug'] } ext.initScreenshotTests = { project -> diff --git a/docs/nightly_build.md b/docs/nightly_build.md index 223fe14824..ea515e90eb 100644 --- a/docs/nightly_build.md +++ b/docs/nightly_build.md @@ -48,7 +48,7 @@ mv towncrier.toml towncrier.toml.bak sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml rm towncrier.toml.bak yes n | towncrier build --version nightly -./gradlew assembleGplayKotlinCryptoNightly appDistributionUploadGplayKotlinCryptoNightly $CI_GRADLE_ARG_PROPERTIES +./gradlew assembleGplayRustCryptoNightly appDistributionUploadRustKotlinCryptoNightly $CI_GRADLE_ARG_PROPERTIES ``` Then you can reset the change on the codebase. diff --git a/flavor.gradle b/flavor.gradle index 688eade4fc..946040e4ed 100644 --- a/flavor.gradle +++ b/flavor.gradle @@ -5,13 +5,13 @@ android { productFlavors { kotlinCrypto { dimension "crypto" - isDefault = true // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" // buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"JC\"" // buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\"" } rustCrypto { dimension "crypto" + isDefault = true // // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" // buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"RC\"" // buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\"" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index f76fb466ad..e3ab104b46 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -334,16 +334,16 @@ android { kotlinCrypto { dimension "crypto" - isDefault = true // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"olm-crypto\"" // buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\"" } rustCrypto { dimension "crypto" - applicationIdSuffix ".corroded" - versionNameSuffix "-R" - resValue "string", "app_name", "ER" + isDefault = true + // applicationIdSuffix ".corroded" + // versionNameSuffix "-R" + // resValue "string", "app_name", "ER" // // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"rust-crypto\"" diff --git a/vector-app/src/gplayRustCrypto/debug/google-services.json b/vector-app/src/gplayRustCrypto/debug/google-services.json deleted file mode 100644 index 465df9d167..0000000000 --- a/vector-app/src/gplayRustCrypto/debug/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "912726360885", - "firebase_url": "https://vector-alpha.firebaseio.com", - "project_id": "vector-alpha", - "storage_bucket": "vector-alpha.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:912726360885:android:ee00f33109f786a800427c", - "android_client_info": { - "package_name": "im.vector.app.corroded.debug" - } - }, - "oauth_client": [ - { - "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} diff --git a/vector-app/src/gplayRustCrypto/nightly/google-services.json b/vector-app/src/gplayRustCrypto/nightly/google-services.json deleted file mode 100644 index 9eb7172825..0000000000 --- a/vector-app/src/gplayRustCrypto/nightly/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "912726360885", - "firebase_url": "https://vector-alpha.firebaseio.com", - "project_id": "vector-alpha", - "storage_bucket": "vector-alpha.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:912726360885:android:94fb99347eaa36d100427c", - "android_client_info": { - "package_name": "im.vector.app.corroded.nightly" - } - }, - "oauth_client": [ - { - "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} diff --git a/vector-app/src/gplayRustCrypto/release/google-services.json b/vector-app/src/gplayRustCrypto/release/google-services.json deleted file mode 100644 index 3647bcfd18..0000000000 --- a/vector-app/src/gplayRustCrypto/release/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "912726360885", - "firebase_url": "https://vector-alpha.firebaseio.com", - "project_id": "vector-alpha", - "storage_bucket": "vector-alpha.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:912726360885:android:94fb99347eaa36d100427c", - "android_client_info": { - "package_name": "im.vector.app.corroded" - } - }, - "oauth_client": [ - { - "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} diff --git a/vector-app/src/gplayRustCryptoNightly/res/values/colors.xml b/vector-app/src/gplayRustCryptoNightly/res/values/colors.xml deleted file mode 100644 index 2ec78e4096..0000000000 --- a/vector-app/src/gplayRustCryptoNightly/res/values/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FF5964 -