diff --git a/eas.json b/eas.json index a66b6c075a..6708036708 100644 --- a/eas.json +++ b/eas.json @@ -5,34 +5,32 @@ }, "build": { "base": { - "node": "18.18.2" + "node": "18.18.2", + "env": { + "EXPO_PUBLIC_LOG_LEVEL": "info" + } }, "development": { "extends": "base", "developmentClient": true, "distribution": "internal", + "channel": "development", "ios": { "simulator": true, "resourceClass": "large" - }, - "channel": "development" - }, - "development-device": { - "extends": "base", - "developmentClient": true, - "distribution": "internal", - "ios": { - "resourceClass": "large" - }, - "channel": "development" + } }, "preview": { "extends": "base", "distribution": "internal", + "channel": "preview", "ios": { "resourceClass": "large" }, - "channel": "preview" + "android": { + "buildType": "apk", + "gradleCommand": ":app:assembleRelease" + } }, "production": { "extends": "base", @@ -40,14 +38,6 @@ "resourceClass": "large" }, "channel": "production" - }, - "dev-android-apk": { - "extends": "base", - "developmentClient": true, - "android": { - "buildType": "apk", - "gradleCommand": ":app:assembleRelease" - } } }, "submit": { diff --git a/package.json b/package.json index 814464a9b3..80c3556f31 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand 'yarn perf:test' --duration 150000 --resultsFilePath .perf/results.json", "perf:test:results": "NODE_ENV=test flashlight report .perf/results.json", "perf:measure": "NODE_ENV=test flashlight measure", - "build:apk": "eas build -p android --profile dev-android-apk", + "build:apk": "eas build -p android --profile preview", "intl:extract": "lingui extract", "intl:compile": "lingui compile" }, diff --git a/src/lib/sentry.ts b/src/lib/sentry.ts index b080bcc5cc..54e8dda5bb 100644 --- a/src/lib/sentry.ts +++ b/src/lib/sentry.ts @@ -1,8 +1,31 @@ +/** + * Importing these separately from `platform/detection` and `lib/app-info` to + * avoid future conflicts and/or circular deps + */ + +import {Platform} from 'react-native' +import app from 'react-native-version-number' +import * as info from 'expo-updates' import {init} from 'sentry-expo' +/** + * Matches the build profiles from `eas.json` + */ +const buildProfile = (info.channel || 'development') as + | 'development' + | 'preview' + | 'production' + +/** + * Examples: + * - `ios@1.57.0(3)` + * - `android@1.57.0(46)` + */ +const appVersion = `${Platform.OS}@${app.appVersion}(${app.buildVersion})` + init({ dsn: 'https://05bc3789bf994b81bd7ce20c86ccd3ae@o4505071687041024.ingest.sentry.io/4505071690514432', - enableInExpoDevelopment: false, // if true, Sentry will try to send events/errors in development mode. debug: false, // If `true`, Sentry will try to print out useful debugging information if something goes wrong with sending the event. Set it to `false` in production - environment: __DEV__ ? 'development' : 'production', // Set the environment + environment: buildProfile, + dist: appVersion, }) diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx index 88cc2d5320..fb4ecf549a 100644 --- a/src/view/screens/Settings.tsx +++ b/src/view/screens/Settings.tsx @@ -172,6 +172,8 @@ export function SettingsScreen({}: Props) { dark: {color: colors.blue2}, }) + console.log(AppInfo) + const dangerBg = useCustomPalette({ light: {backgroundColor: colors.red1}, dark: {backgroundColor: colors.red7},