Skip to content

Commit 35e5ad1

Browse files
authored
chore: delete Experimental code paths and assets (#7322)
1 parent 054e84c commit 35e5ad1

79 files changed

Lines changed: 184 additions & 2145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/build-ios/action.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ runs:
7878
agvtool new-version -all ${{ inputs.BUILD_VERSION }}
7979
/usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ inputs.BUGSNAG_KEY_OFFICIAL }}" ./RocketChatRN/Info.plist
8080
/usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ inputs.BUGSNAG_KEY_OFFICIAL }}" ./ShareRocketChatRN/Info.plist
81-
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./RocketChatRN/Info.plist
82-
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./ShareRocketChatRN/Info.plist
83-
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./NotificationService/Info.plist
8481
shell: bash
8582

8683
- name: Set Google Services

.github/workflows/e2e-build-android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ jobs:
7777
echo -e "hermesEnabled=true" >> ./gradle.properties
7878
echo -e "VERSIONCODE=999999" >> ./gradle.properties
7979
echo -e "KEYSTORE=release.keystore" >> ./gradle.properties
80-
echo -e "KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}" >> ./gradle.properties
81-
echo -e "KEY_ALIAS=${{ secrets.KEYSTORE_OFFICIAL_ALIAS }}" >> ./gradle.properties
82-
echo -e "KEY_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}" >> ./gradle.properties
83-
echo -e "BugsnagAPIKey=${{ secrets.BUGSNAG_KEY_OFFICIAL }}" >> ./gradle.properties
80+
echo -e 'KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}' >> ./gradle.properties
81+
echo -e 'KEY_ALIAS=${{ secrets.KEYSTORE_OFFICIAL_ALIAS }}' >> ./gradle.properties
82+
echo -e 'KEY_PASSWORD=${{ secrets.KEYSTORE_OFFICIAL_PASSWORD }}' >> ./gradle.properties
83+
echo -e 'BugsnagAPIKey=${{ secrets.BUGSNAG_KEY_OFFICIAL }}' >> ./gradle.properties
8484
8585
- name: Build Android Release APK
8686
working-directory: android

.github/workflows/e2e-build-ios.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,11 @@ jobs:
7070
run: |
7171
echo ${{ secrets.APP_STORE_CONNECT_API_KEY_BASE64 }} | base64 --decode > ./ios/fastlane/app_store_connect_api_key.p8
7272
73-
- name: Set bugsnag key and IS_OFFICIAL
73+
- name: Set bugsnag key
7474
run: |
7575
cd ios
7676
/usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ secrets.BUGSNAG_KEY}}" ./RocketChatRN/Info.plist
7777
/usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ secrets.BUGSNAG_KEY}}" ./ShareRocketChatRN/Info.plist
78-
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./RocketChatRN/Info.plist
79-
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./ShareRocketChatRN/Info.plist
80-
/usr/libexec/PlistBuddy -c "Set IS_OFFICIAL YES" ./NotificationService/Info.plist
8178
8279
- name: Build iOS app
8380
run: |

.maestro/helpers/login.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ onFlowStart:
3333
visible:
3434
id: rooms-list-view
3535
timeout: 60000
36+
- runFlow:
37+
when:
38+
platform: iOS
39+
visible: 'Not Now'
40+
commands:
41+
- tapOn: 'Not Now'

android/app/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,6 @@ android {
124124
productFlavors {
125125
official {
126126
dimension = "app"
127-
buildConfigField "boolean", "IS_OFFICIAL", "true"
128-
}
129-
experimental {
130-
dimension = "app"
131-
buildConfigField "boolean", "IS_OFFICIAL", "false"
132127
}
133128
}
134129
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
2-
<string name="app_name">[DEBUG] Rocket.Chat Experimental</string>
3-
<string name="share_extension_name">[DEBUG] Rocket.Chat Experimental</string>
2+
<string name="app_name">[DEBUG] Rocket.Chat</string>
3+
<string name="share_extension_name">[DEBUG] Rocket.Chat</string>
44
</resources>
-40 KB
Binary file not shown.
-7.28 KB
Binary file not shown.
-4.47 KB
Binary file not shown.

android/app/src/experimental/res/drawable-v24/ic_launcher_background.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)