diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2f36faa6..fb8b1377 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -172,7 +172,7 @@ android {
}
manifestPlaceholders = [
runtimeVersion: project.hasProperty('runtimeVersion') ? project.property('runtimeVersion') : "",
- releaseChannel: project.hasProperty('releaseChannel') ? project.property('releaseChannel') : "default"
+ branch: project.hasProperty('branch') ? project.property('branch') : "development"
]
}
if (isNewArchitectureEnabled()) {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 043124d8..d6209e89 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 66b5c9ad..9791512c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -32,7 +32,7 @@ private_lane :build_ios do
DSYM_FILE = "#{BUILD_DIRECTORY}/tooot.app.dSYM.zip"
set_info_plist_value( path: EXPO_PLIST, key: "EXUpdatesRuntimeVersion", value: VERSION )
- set_info_plist_value( path: EXPO_PLIST, key: "EXUpdatesReleaseChannel", value: ENVIRONMENT )
+ set_info_plist_value( path: EXPO_PLIST, key: "EXUpdatesRequestHeaders", subkey: "expo-channel-name", value: ENVIRONMENT )
setup_ci
set_info_plist_value( path: INFO_PLIST, key: "CFBundleShortVersionString", value: VERSION )
@@ -98,7 +98,7 @@ private_lane :build_android do
print_command_output: true,
properties: {
"runtimeVersion" => VERSION,
- "releaseChannel" => ENVIRONMENT,
+ "branch" => ENVIRONMENT,
"android.injected.signing.store.file" => "#{File.expand_path('..', Dir.pwd)}/android/tooot.jks",
"android.injected.signing.store.password" => ENV["ANDROID_KEYSTORE_PASSWORD"],
"android.injected.signing.key.alias" => ENV["ANDROID_KEYSTORE_ALIAS"],
@@ -137,7 +137,7 @@ private_lane :build_android_apk do
print_command_output: true,
properties: {
"runtimeVersion" => VERSION,
- "releaseChannel" => ENVIRONMENT,
+ "branch" => ENVIRONMENT,
"android.injected.signing.store.file" => "#{File.expand_path('..', Dir.pwd)}/android/tooot.jks",
"android.injected.signing.store.password" => ENV["ANDROID_KEYSTORE_PASSWORD"],
"android.injected.signing.key.alias" => ENV["ANDROID_KEYSTORE_ALIAS"],
diff --git a/ios/tooot/Supporting/Expo.plist b/ios/tooot/Supporting/Expo.plist
index 8c6922ef..27a3a226 100644
--- a/ios/tooot/Supporting/Expo.plist
+++ b/ios/tooot/Supporting/Expo.plist
@@ -8,8 +8,11 @@
EXUpdatesLaunchWaitMs
0
- EXUpdatesReleaseChannel
- development
+ EXUpdatesRequestHeaders
+
+ expo-channel-name
+ development
+
EXUpdatesRuntimeVersion
0
EXUpdatesURL
diff --git a/src/utils/checkEnvironment.ts b/src/utils/checkEnvironment.ts
index a60babf4..08af0d9d 100644
--- a/src/utils/checkEnvironment.ts
+++ b/src/utils/checkEnvironment.ts
@@ -36,14 +36,14 @@ const mapEnvironment = ({
const isDevelopment =
__DEV__ ||
- ['development'].some(channel => (Updates.channel || Updates.releaseChannel) === channel)
+ ['development'].some(channel => (Updates.channel) === channel)
const isCandidate = ['candidate'].some(channel =>
- (Updates.channel || Updates.releaseChannel) === channel
+ (Updates.channel) === channel
)
const isRelease = ['release'].some(channel =>
- (Updates.channel || Updates.releaseChannel) === channel
+ (Updates.channel) === channel
)
export { mapEnvironment, isDevelopment, isCandidate, isRelease }