Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/actions/build-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
12 changes: 6 additions & 6 deletions .github/actions/build-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
8 changes: 4 additions & 4 deletions .github/actions/upload-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .github/actions/upload-internal-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/upload-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/run-maestro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

outputs:
artifact_name: Android Official APK
artifact_name: Android APK

steps:
- name: Checkout Repository
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maestro-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions .maestro/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<img alt="Download on App Store" src="https://user-images.githubusercontent.com/7317008/43209852-4ca39622-904b-11e8-8ce1-cdc3aee76ae9.png" height=43>
</a>

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

Expand Down
7 changes: 0 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ android {
}
}
}

flavorDimensions "app"
productFlavors {
official {
dimension = "app"
}
}
}

dependencies {
Expand Down
3 changes: 2 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools"
android:sharedUserId="chat.rocket.android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand Down
Binary file modified android/app/src/main/ic_launcher-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions android/app/src/official/AndroidManifest.xml

This file was deleted.

Binary file removed android/app/src/official/ic_launcher-web.png
Binary file not shown.
8 changes: 4 additions & 4 deletions android/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ 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

desc "Upload App to Internal App Sharing"
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,
Expand Down
File renamed without changes.
Loading
Loading