diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index 9e88cce61a3..b84ba5536f1 100644 --- a/.github/actions/build-android/action.yml +++ b/.github/actions/build-android/action.yml @@ -8,19 +8,19 @@ inputs: description: 'Google services JSON' required: true BUGSNAG_KEY_OFFICIAL: - description: 'Bugsnag API key for official build' + description: 'Bugsnag API key' required: true KEYSTORE_OFFICIAL_BASE64: - description: 'Base64 encoded keystore for official build' + description: 'Base64 encoded keystore' required: true KEYSTORE_OFFICIAL: - description: 'Keystore file name for official build' + description: 'Keystore file name' required: true KEYSTORE_OFFICIAL_PASSWORD: - description: 'Keystore password for official build' + description: 'Keystore password' required: true KEYSTORE_OFFICIAL_ALIAS: - description: 'Keystore alias for official build' + description: 'Keystore alias' required: true runs: @@ -81,17 +81,17 @@ runs: - name: Build Android Release AAB working-directory: android - run: ./gradlew bundleOfficialRelease + run: ./gradlew bundleRelease shell: bash - name: Upload sourcemaps/NDK symbols to Bugsnag run: | - pnpm bugsnag:upload-android --variant officialRelease --app-manifest android/app/build/intermediates/merged_manifests/officialRelease/processOfficialReleaseManifest/AndroidManifest.xml - pnpm exec bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialRelease/app-official-release.aab + pnpm bugsnag:upload-android --variant release --app-manifest android/app/build/intermediates/merged_manifests/release/processReleaseManifest/AndroidManifest.xml + pnpm exec bugsnag-cli upload android-aab android/app/build/outputs/bundle/release/app-release.aab shell: bash - - name: Upload Official AAB + - name: Upload AAB uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: android-aab-official - path: android/app/build/outputs/bundle/officialRelease/app-official-release.aab + name: android-aab + path: android/app/build/outputs/bundle/release/app-release.aab diff --git a/.github/actions/build-ios/action.yml b/.github/actions/build-ios/action.yml index fa7863e2602..ddb2133bd5d 100644 --- a/.github/actions/build-ios/action.yml +++ b/.github/actions/build-ios/action.yml @@ -26,10 +26,10 @@ inputs: description: 'Fastlane Repo PAT' required: true BUGSNAG_KEY_OFFICIAL: - description: 'Bugsnag API Key Official' + description: 'Bugsnag API Key' required: true GOOGLE_SERVICES_IOS: - description: 'Google service file for official version' + description: 'Google service file' required: true runs: @@ -90,7 +90,7 @@ runs: - name: Build iOS app working-directory: ios - run: bundle exec fastlane ios build_official + run: bundle exec fastlane ios build env: MATCH_KEYCHAIN_NAME: ${{ inputs.MATCH_KEYCHAIN_NAME }} MATCH_KEYCHAIN_PASSWORD: ${{ inputs.MATCH_KEYCHAIN_PASSWORD }} @@ -103,17 +103,17 @@ runs: - name: Upload IPA artifact uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: ios-build-official + name: ios-build path: ios/Rocket.Chat.ipa - name: Upload Rocket.Chat.app.dSYM.zip uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: ios-build-official-dSYM + name: ios-build-dSYM path: ios/Rocket.Chat.app.dSYM.zip - name: Upload RocketChatRN/Info.plist uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: ios-build-official-info-plist + name: ios-build-info-plist path: ios/RocketChatRN/Info.plist diff --git a/.github/actions/upload-android/action.yml b/.github/actions/upload-android/action.yml index c42d0259809..2a2e9dbb583 100644 --- a/.github/actions/upload-android/action.yml +++ b/.github/actions/upload-android/action.yml @@ -18,11 +18,11 @@ inputs: runs: using: "composite" steps: - - name: Download Official AAB + - name: Download AAB uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: - name: android-aab-official - path: android/app/build/outputs/bundle/officialRelease/ + name: android-aab + path: android/app/build/outputs/bundle/release/ - name: Set up Ruby and Bundler uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0 @@ -64,7 +64,7 @@ runs: bundle exec fastlane android beta fi if [[ ${{ inputs.trigger }} == "develop" ]]; then - bundle exec fastlane android official_open_testing + bundle exec fastlane android open_testing fi shell: bash diff --git a/.github/actions/upload-internal-android/action.yml b/.github/actions/upload-internal-android/action.yml index a8ee1f4616d..7a08f2aa177 100644 --- a/.github/actions/upload-internal-android/action.yml +++ b/.github/actions/upload-internal-android/action.yml @@ -18,11 +18,11 @@ inputs: runs: using: "composite" steps: - - name: Download Official AAB + - name: Download AAB uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: - name: android-aab-official - path: android/app/build/outputs/bundle/officialRelease/ + name: android-aab + path: android/app/build/outputs/bundle/release/ - name: Set up Ruby and Bundler uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0 diff --git a/.github/actions/upload-ios/action.yml b/.github/actions/upload-ios/action.yml index 0822a6bc315..83d1e6650b9 100644 --- a/.github/actions/upload-ios/action.yml +++ b/.github/actions/upload-ios/action.yml @@ -36,19 +36,19 @@ runs: - name: Download iOS build uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: - name: ios-build-official + name: ios-build path: ios/ - name: Download dSYM uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: - name: ios-build-official-dSYM + name: ios-build-dSYM path: ios/ - name: Download Info.plist uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: - name: ios-build-official-info-plist + name: ios-build-info-plist path: ios/RocketChatRN/ - name: Pod Cache @@ -91,7 +91,7 @@ runs: - name: Fastlane Submit to TestFlight working-directory: ios run: | - echo "Submitting to TestFlight as Official" + echo "Submitting to TestFlight" bundle exec fastlane ios beta env: MATCH_KEYCHAIN_NAME: ${{ inputs.MATCH_KEYCHAIN_NAME }} diff --git a/.github/scripts/run-maestro.sh b/.github/scripts/run-maestro.sh index 206d532671f..1af51d16c8e 100755 --- a/.github/scripts/run-maestro.sh +++ b/.github/scripts/run-maestro.sh @@ -71,7 +71,7 @@ printf ' %s\n' "${FLOW_FILES[@]}" if [ "$PLATFORM" = "android" ]; then adb shell settings put system show_touches 1 || true - adb install -r "app-official-release.apk" || true + adb install -r "app-release.apk" || true adb shell monkey -p "$APP_ID" -c android.intent.category.LAUNCHER 1 || true sleep 6 adb shell am force-stop "$APP_ID" || true diff --git a/.github/workflows/build-official-android.yml b/.github/workflows/build-android.yml similarity index 98% rename from .github/workflows/build-official-android.yml rename to .github/workflows/build-android.yml index 18d2bdf7fe8..e52820c129b 100644 --- a/.github/workflows/build-official-android.yml +++ b/.github/workflows/build-android.yml @@ -34,7 +34,7 @@ jobs: - name: Fetch supported versions from Cloud uses: ./.github/actions/fetch-supported-versions with: - build_name: 'android-official' + build_name: 'android' - name: Generate Build Version id: version diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 43ae6c9dd0f..6747598ec17 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -23,19 +23,19 @@ jobs: needs: [run-eslint-and-test] uses: ./.github/workflows/generate-changelog.yml - android-build-official-store: - name: Build Android Official + android-build-store: + name: Build Android if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }} - uses: ./.github/workflows/build-official-android.yml + uses: ./.github/workflows/build-android.yml needs: [run-eslint-and-test, generate-changelog] secrets: inherit with: trigger: develop - ios-build-official-store: - name: Build iOS Official + ios-build-store: + name: Build iOS if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }} - uses: ./.github/workflows/build-official-ios.yml + uses: ./.github/workflows/build-ios.yml needs: [run-eslint-and-test, generate-changelog] secrets: inherit with: diff --git a/.github/workflows/build-official-ios.yml b/.github/workflows/build-ios.yml similarity index 98% rename from .github/workflows/build-official-ios.yml rename to .github/workflows/build-ios.yml index 0e8e6538b8f..83fcc2515c4 100644 --- a/.github/workflows/build-official-ios.yml +++ b/.github/workflows/build-ios.yml @@ -32,7 +32,7 @@ jobs: - name: Fetch supported versions from Cloud uses: ./.github/actions/fetch-supported-versions with: - build_name: 'ios-official' + build_name: 'ios' - name: Generate Build Version id: version diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 66648988794..be6d8dd9e84 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -19,19 +19,19 @@ jobs: if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }} uses: ./.github/workflows/eslint.yml - android-build-official-store: - name: Build Android Official + android-build-store: + name: Build Android if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }} - uses: ./.github/workflows/build-official-android.yml + uses: ./.github/workflows/build-android.yml needs: [run-eslint-and-test] secrets: inherit with: trigger: "pr" - ios-build-official-store: - name: Build iOS Official + ios-build-store: + name: Build iOS if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }} - uses: ./.github/workflows/build-official-ios.yml + uses: ./.github/workflows/build-ios.yml needs: [run-eslint-and-test] secrets: inherit with: diff --git a/.github/workflows/e2e-build-android.yml b/.github/workflows/e2e-build-android.yml index 0af152f5bfd..91ef6212dd1 100644 --- a/.github/workflows/e2e-build-android.yml +++ b/.github/workflows/e2e-build-android.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest outputs: - artifact_name: Android Official APK + artifact_name: Android APK steps: - name: Checkout Repository @@ -84,12 +84,12 @@ jobs: - name: Build Android Release APK working-directory: android - run: ./gradlew assembleOfficialRelease --build-cache --parallel --max-workers=4 --no-daemon --stacktrace + run: ./gradlew assembleRelease --build-cache --parallel --max-workers=4 --no-daemon --stacktrace env: RUNNING_E2E_TESTS: true - name: Upload APK uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: Android Official APK - path: android/app/build/outputs/apk/official/release/app-official-release.apk + name: Android APK + path: android/app/build/outputs/apk/release/app-release.apk diff --git a/.github/workflows/e2e-build-ios.yml b/.github/workflows/e2e-build-ios.yml index 08f0b3e2d4d..3487a52163f 100644 --- a/.github/workflows/e2e-build-ios.yml +++ b/.github/workflows/e2e-build-ios.yml @@ -80,7 +80,7 @@ jobs: run: | cd ios export RUNNING_E2E_TESTS=true - bundle exec fastlane ios build_official_simulator \ + bundle exec fastlane ios build_simulator \ disable_xcpretty:false \ skip_package_ipa:true \ skip_archive:true diff --git a/.github/workflows/maestro-android.yml b/.github/workflows/maestro-android.yml index 0026e64d027..80028fa74c7 100644 --- a/.github/workflows/maestro-android.yml +++ b/.github/workflows/maestro-android.yml @@ -42,7 +42,7 @@ jobs: - name: Download APK uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: - name: Android Official APK + name: Android APK - name: Setup E2E Account uses: ./.github/actions/e2e-account diff --git a/.maestro/README.md b/.maestro/README.md index 284b756386e..118601eceab 100644 --- a/.maestro/README.md +++ b/.maestro/README.md @@ -68,14 +68,7 @@ Create a release version APK or IPA file and install it on your device/simulator #### Android Production Build ```bash -./gradlew bundleOfficialRelease -``` - -#### iOS Production Build (Simulator) - -Build Experimental app for Simulator: -```bash -bundle exec fastlane build_experimental_simulator +./gradlew bundleRelease ``` ### Option 2: Development Build diff --git a/README.md b/README.md index f521969ec4a..681b064bdaf 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Download on App Store -Check [our docs](https://developer.rocket.chat/docs/mobile-app) for beta and Experimental versions. +Check [our docs](https://developer.rocket.chat/docs/mobile-app) for beta versions. ## Reporting an Issue diff --git a/android/app/build.gradle b/android/app/build.gradle index 61f8c0bd6c8..7e6f259f09c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -119,13 +119,6 @@ android { } } } - - flavorDimensions "app" - productFlavors { - official { - dimension = "app" - } - } } dependencies { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9aa86efbc98..2029e7fd2f0 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" + android:sharedUserId="chat.rocket.android"> diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png index cc5e2e30b6a..ee9b88757fa 100644 Binary files a/android/app/src/main/ic_launcher-web.png and b/android/app/src/main/ic_launcher-web.png differ diff --git a/android/app/src/official/res/drawable-hdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-hdpi/bootsplash_logo.png similarity index 100% rename from android/app/src/official/res/drawable-hdpi/bootsplash_logo.png rename to android/app/src/main/res/drawable-hdpi/bootsplash_logo.png diff --git a/android/app/src/official/res/drawable-mdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-mdpi/bootsplash_logo.png similarity index 100% rename from android/app/src/official/res/drawable-mdpi/bootsplash_logo.png rename to android/app/src/main/res/drawable-mdpi/bootsplash_logo.png diff --git a/android/app/src/official/res/drawable-xhdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-xhdpi/bootsplash_logo.png similarity index 100% rename from android/app/src/official/res/drawable-xhdpi/bootsplash_logo.png rename to android/app/src/main/res/drawable-xhdpi/bootsplash_logo.png diff --git a/android/app/src/official/res/drawable-xxhdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png similarity index 100% rename from android/app/src/official/res/drawable-xxhdpi/bootsplash_logo.png rename to android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png diff --git a/android/app/src/official/res/drawable-xxxhdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-xxxhdpi/bootsplash_logo.png similarity index 100% rename from android/app/src/official/res/drawable-xxxhdpi/bootsplash_logo.png rename to android/app/src/main/res/drawable-xxxhdpi/bootsplash_logo.png diff --git a/android/app/src/official/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from android/app/src/official/res/drawable/ic_launcher_background.xml rename to android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/android/app/src/official/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from android/app/src/official/res/drawable/ic_launcher_foreground.xml rename to android/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/android/app/src/official/res/drawable/ic_launcher_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml similarity index 100% rename from android/app/src/official/res/drawable/ic_launcher_monochrome.xml rename to android/app/src/main/res/drawable/ic_launcher_monochrome.xml diff --git a/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from android/app/src/official/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/android/app/src/official/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from android/app/src/official/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/android/app/src/official/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from android/app/src/official/res/mipmap-hdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/android/app/src/official/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/official/res/mipmap-hdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/android/app/src/official/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from android/app/src/official/res/mipmap-mdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/android/app/src/official/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/official/res/mipmap-mdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/android/app/src/official/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from android/app/src/official/res/mipmap-xhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/app/src/official/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/official/res/mipmap-xhdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/android/app/src/official/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from android/app/src/official/res/mipmap-xxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/app/src/official/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/official/res/mipmap-xxhdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/android/app/src/official/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from android/app/src/official/res/mipmap-xxxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/android/app/src/official/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/official/res/mipmap-xxxhdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/android/app/src/official/res/values/colors.xml b/android/app/src/main/res/values/colors.xml similarity index 100% rename from android/app/src/official/res/values/colors.xml rename to android/app/src/main/res/values/colors.xml diff --git a/android/app/src/official/res/values/strings.xml b/android/app/src/main/res/values/strings.xml similarity index 100% rename from android/app/src/official/res/values/strings.xml rename to android/app/src/main/res/values/strings.xml diff --git a/android/app/src/official/AndroidManifest.xml b/android/app/src/official/AndroidManifest.xml deleted file mode 100644 index 7b43414319e..00000000000 --- a/android/app/src/official/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/android/app/src/official/ic_launcher-web.png b/android/app/src/official/ic_launcher-web.png deleted file mode 100644 index ee9b88757fa..00000000000 Binary files a/android/app/src/official/ic_launcher-web.png and /dev/null differ diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 6f754b3bc3f..f6a2b7b4787 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -37,7 +37,7 @@ platform :android do upload_to_play_store( package_name: 'chat.rocket.android', track: 'internal', - aab: 'app/build/outputs/bundle/officialRelease/app-official-release.aab' + aab: 'app/build/outputs/bundle/release/app-release.aab' ) end @@ -45,16 +45,16 @@ platform :android do lane :internal_app_sharing do upload_to_play_store_internal_app_sharing( package_name: 'chat.rocket.android', - aab: 'app/build/outputs/bundle/officialRelease/app-official-release.aab' + aab: 'app/build/outputs/bundle/release/app-release.aab' ) end desc "Upload App to Play Store Open Testing" - lane :official_open_testing do + lane :open_testing do upload_to_play_store( package_name: 'chat.rocket.android', track: 'beta', - aab: 'app/build/outputs/bundle/officialRelease/app-official-release.aab', + aab: 'app/build/outputs/bundle/release/app-release.aab', skip_upload_metadata: true, skip_upload_changelogs: false, skip_upload_images: true, diff --git a/ios/Official.xcassets/AppIcon.appiconset/100.png b/ios/Assets.xcassets/AppIcon.appiconset/100.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/100.png rename to ios/Assets.xcassets/AppIcon.appiconset/100.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/1024 1.png b/ios/Assets.xcassets/AppIcon.appiconset/1024 1.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/1024 1.png rename to ios/Assets.xcassets/AppIcon.appiconset/1024 1.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/1024.png b/ios/Assets.xcassets/AppIcon.appiconset/1024.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/1024.png rename to ios/Assets.xcassets/AppIcon.appiconset/1024.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/114.png b/ios/Assets.xcassets/AppIcon.appiconset/114.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/114.png rename to ios/Assets.xcassets/AppIcon.appiconset/114.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/120.png b/ios/Assets.xcassets/AppIcon.appiconset/120.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/120.png rename to ios/Assets.xcassets/AppIcon.appiconset/120.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/144.png b/ios/Assets.xcassets/AppIcon.appiconset/144.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/144.png rename to ios/Assets.xcassets/AppIcon.appiconset/144.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/152.png b/ios/Assets.xcassets/AppIcon.appiconset/152.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/152.png rename to ios/Assets.xcassets/AppIcon.appiconset/152.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/167.png b/ios/Assets.xcassets/AppIcon.appiconset/167.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/167.png rename to ios/Assets.xcassets/AppIcon.appiconset/167.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/180.png b/ios/Assets.xcassets/AppIcon.appiconset/180.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/180.png rename to ios/Assets.xcassets/AppIcon.appiconset/180.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/20.png b/ios/Assets.xcassets/AppIcon.appiconset/20.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/20.png rename to ios/Assets.xcassets/AppIcon.appiconset/20.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/29.png b/ios/Assets.xcassets/AppIcon.appiconset/29.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/29.png rename to ios/Assets.xcassets/AppIcon.appiconset/29.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/40.png b/ios/Assets.xcassets/AppIcon.appiconset/40.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/40.png rename to ios/Assets.xcassets/AppIcon.appiconset/40.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/50.png b/ios/Assets.xcassets/AppIcon.appiconset/50.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/50.png rename to ios/Assets.xcassets/AppIcon.appiconset/50.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/57.png b/ios/Assets.xcassets/AppIcon.appiconset/57.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/57.png rename to ios/Assets.xcassets/AppIcon.appiconset/57.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/58.png b/ios/Assets.xcassets/AppIcon.appiconset/58.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/58.png rename to ios/Assets.xcassets/AppIcon.appiconset/58.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/60.png b/ios/Assets.xcassets/AppIcon.appiconset/60.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/60.png rename to ios/Assets.xcassets/AppIcon.appiconset/60.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/72.png b/ios/Assets.xcassets/AppIcon.appiconset/72.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/72.png rename to ios/Assets.xcassets/AppIcon.appiconset/72.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/76.png b/ios/Assets.xcassets/AppIcon.appiconset/76.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/76.png rename to ios/Assets.xcassets/AppIcon.appiconset/76.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/80.png b/ios/Assets.xcassets/AppIcon.appiconset/80.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/80.png rename to ios/Assets.xcassets/AppIcon.appiconset/80.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/87.png b/ios/Assets.xcassets/AppIcon.appiconset/87.png similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/87.png rename to ios/Assets.xcassets/AppIcon.appiconset/87.png diff --git a/ios/Official.xcassets/AppIcon.appiconset/Contents.json b/ios/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ios/Official.xcassets/AppIcon.appiconset/Contents.json rename to ios/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/ios/Official.xcassets/Contents.json b/ios/Assets.xcassets/Contents.json similarity index 100% rename from ios/Official.xcassets/Contents.json rename to ios/Assets.xcassets/Contents.json diff --git a/ios/Official.xcassets/Launch Screen Icon.imageset/Contents.json b/ios/Assets.xcassets/Launch Screen Icon.imageset/Contents.json similarity index 100% rename from ios/Official.xcassets/Launch Screen Icon.imageset/Contents.json rename to ios/Assets.xcassets/Launch Screen Icon.imageset/Contents.json diff --git a/ios/Official.xcassets/Launch Screen Icon.imageset/Icon.png b/ios/Assets.xcassets/Launch Screen Icon.imageset/Icon.png similarity index 100% rename from ios/Official.xcassets/Launch Screen Icon.imageset/Icon.png rename to ios/Assets.xcassets/Launch Screen Icon.imageset/Icon.png diff --git a/ios/Official.xcassets/Launch Screen Icon.imageset/Icon@2x.png b/ios/Assets.xcassets/Launch Screen Icon.imageset/Icon@2x.png similarity index 100% rename from ios/Official.xcassets/Launch Screen Icon.imageset/Icon@2x.png rename to ios/Assets.xcassets/Launch Screen Icon.imageset/Icon@2x.png diff --git a/ios/Official.xcassets/Launch Screen Icon.imageset/Icon@3x.png b/ios/Assets.xcassets/Launch Screen Icon.imageset/Icon@3x.png similarity index 100% rename from ios/Official.xcassets/Launch Screen Icon.imageset/Icon@3x.png rename to ios/Assets.xcassets/Launch Screen Icon.imageset/Icon@3x.png diff --git a/ios/Official.xcassets/splashBackgroundColor.colorset/Contents.json b/ios/Assets.xcassets/splashBackgroundColor.colorset/Contents.json similarity index 100% rename from ios/Official.xcassets/splashBackgroundColor.colorset/Contents.json rename to ios/Assets.xcassets/splashBackgroundColor.colorset/Contents.json diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index fe29e78b7a6..479b20bd6a7 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -122,7 +122,7 @@ 1ED038CA2B50A58400C007D4 /* ServersLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED038C92B50A58400C007D4 /* ServersLoader.swift */; }; 1ED1EC892B867E2400F6620C /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED1EC882B867E2400F6620C /* ExtensionDelegate.swift */; }; 1ED1ECE42B8699E900F6620C /* Rocket.Chat Watch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 1ED0388E2B507B4B00C007D4 /* Rocket.Chat Watch.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 1ED1ECEA2B869A4A00F6620C /* Official.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A14FCF3257FEB59005BDCD4 /* Official.xcassets */; }; + 1ED1ECEA2B869A4A00F6620C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A14FCF3257FEB59005BDCD4 /* Assets.xcassets */; }; 1EDB30F22B5B453A00532C7E /* LoggedInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDB30F12B5B453A00532C7E /* LoggedInView.swift */; }; 1EDFD0FA2B589B8F002FEE5F /* MessagesLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDFD0F92B589B8F002FEE5F /* MessagesLoader.swift */; }; 1EDFD1062B58A66E002FEE5F /* CancelBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EDFD1052B58A66E002FEE5F /* CancelBag.swift */; }; @@ -152,7 +152,7 @@ 7A0129D42C6E8EC800F84A97 /* ShareRocketChatRN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A0129D22C6E8B5900F84A97 /* ShareRocketChatRN.swift */; }; 7A0129D62C6E8F0700F84A97 /* ShareRocketChatRN.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 1EC6AD6022CBA20C00A41C61 /* ShareRocketChatRN.entitlements */; }; 7A0129EA2C6E921600F84A97 /* MainInterface.storyboard in Sources */ = {isa = PBXBuildFile; fileRef = 1EC6ACB522CB9FC300A41C61 /* MainInterface.storyboard */; }; - 7A14FCF4257FEB59005BDCD4 /* Official.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A14FCF3257FEB59005BDCD4 /* Official.xcassets */; }; + 7A14FCF4257FEB59005BDCD4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A14FCF3257FEB59005BDCD4 /* Assets.xcassets */; }; 7A1B58412F5F58FF002A6BDE /* VoipPayload.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1B58402F5F58FF002A6BDE /* VoipPayload.swift */; }; 7A1B58452F5F63DB002A6BDE /* AppDelegate+Voip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1B58432F5F63DB002A6BDE /* AppDelegate+Voip.swift */; }; 7A3704572F7DB36E009085FC /* VoipPerCallDdpRegistry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3704552F7DB36E009085FC /* VoipPerCallDdpRegistry.swift */; }; @@ -435,7 +435,7 @@ 7A006F13229C83B600803143 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 7A0129D22C6E8B5900F84A97 /* ShareRocketChatRN.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareRocketChatRN.swift; sourceTree = ""; }; 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; - 7A14FCF3257FEB59005BDCD4 /* Official.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Official.xcassets; sourceTree = ""; }; + 7A14FCF3257FEB59005BDCD4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 7A1B58402F5F58FF002A6BDE /* VoipPayload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoipPayload.swift; sourceTree = ""; }; 7A1B58432F5F63DB002A6BDE /* AppDelegate+Voip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Voip.swift"; sourceTree = ""; }; 7A3704552F7DB36E009085FC /* VoipPerCallDdpRegistry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoipPerCallDdpRegistry.swift; sourceTree = ""; }; @@ -526,7 +526,7 @@ 60B2A6A31FC4588700BD58E5 /* RocketChatRN.entitlements */, 008F07F21AC5B25A0029DE68 /* main.jsbundle */, 13B07FB51A68108700A75B9A /* Images.xcassets */, - 7A14FCF3257FEB59005BDCD4 /* Official.xcassets */, + 7A14FCF3257FEB59005BDCD4 /* Assets.xcassets */, 13B07FB61A68108700A75B9A /* Info.plist */, 7AAA749C23043B1D00F1ADE9 /* RocketChatRN-Bridging-Header.h */, 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */, @@ -1195,7 +1195,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1ED1ECEA2B869A4A00F6620C /* Official.xcassets in Resources */, + 1ED1ECEA2B869A4A00F6620C /* Assets.xcassets in Resources */, 1ED038982B507B4D00C007D4 /* Preview Assets.xcassets in Resources */, 1E044F992B92798E00BCA2FD /* Localizable.xcstrings in Resources */, 65AD383B2BFBDF4A00271B39 /* PrivacyInfo.xcprivacy in Resources */, @@ -1226,7 +1226,7 @@ buildActionMask = 2147483647; files = ( 65B9A71B2AFC24190088956F /* ringtone.mp3 in Resources */, - 7A14FCF4257FEB59005BDCD4 /* Official.xcassets in Resources */, + 7A14FCF4257FEB59005BDCD4 /* Assets.xcassets in Resources */, 7A610CD527ECE38100B8ABDD /* custom.ttf in Resources */, 7AAB3E42257E6A6E00707CF6 /* Images.xcassets in Resources */, 7AE10C0828A59530003593CB /* Inter.ttf in Resources */, diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index c996dda6755..ad8743cfa5c 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -66,8 +66,8 @@ platform :ios do ) end - desc "Build Official app" - lane :build_official do + desc "Build app" + lane :build do match( type: "appstore", platform: "ios", @@ -116,8 +116,8 @@ platform :ios do gym(scheme: "RocketChatRN", workspace: "RocketChatRN.xcworkspace", skip_codesigning: true, skip_archive: true) end - desc "Build Official app for Simulator" - lane :build_official_simulator do + desc "Build app for Simulator" + lane :build_simulator do gym( scheme: "RocketChat", workspace: "RocketChatRN.xcworkspace", diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md index f93c95b627a..61c4fcfe27a 100644 --- a/ios/fastlane/README.md +++ b/ios/fastlane/README.md @@ -1,44 +1,56 @@ fastlane documentation -================ +---- + # Installation Make sure you have the latest version of the Xcode command line tools installed: -``` +```sh xcode-select --install ``` -Install _fastlane_ using -``` -[sudo] gem install fastlane -NV -``` -or alternatively using `brew install fastlane` +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) # Available Actions + ## iOS + ### ios beta + +```sh +[bundle exec] fastlane ios beta ``` -fastlane ios beta -``` + Submit a new Beta Build to Apple TestFlight -### ios build_official -``` -fastlane ios build_official + +### ios build + +```sh +[bundle exec] fastlane ios build ``` -Build Official app + +Build app + ### ios build_fork + +```sh +[bundle exec] fastlane ios build_fork ``` -fastlane ios build_fork -``` + Build fork app -### ios build_official_simulator -``` -fastlane ios build_official_simulator + +### ios build_simulator + +```sh +[bundle exec] fastlane ios build_simulator ``` -Build Official app for Simulator + +Build app for Simulator ---- -This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run. -More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). -The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools). +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/package.json b/package.json index 923f16d6d7d..216f33912c3 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "prettier-lint": "prettier --write . && pnpm lint", "ios": "npx react-native run-ios", "pod-install": "bundle exec pod install --project-directory=ios", - "android": "npx react-native run-android --mode=officialDebug --main-activity chat.rocket.reactnative.MainActivity", - "android-whitelabel": "npx react-native run-android --main-activity chat.rocket.reactnative.MainActivity --mode=officialDebug --appId", + "android": "npx react-native run-android --main-activity chat.rocket.reactnative.MainActivity", + "android-whitelabel": "npx react-native run-android --main-activity chat.rocket.reactnative.MainActivity --appId", "log-android": "react-native log-android", "snyk-protect": "snyk protect", "postinstall": "patch-package",