Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update fastfile and set release for Sentry #356

Merged
merged 1 commit into from
Feb 11, 2020
Merged

Update fastfile and set release for Sentry #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
### Removed

### Changed

## [1.2.4-1](https://github.com/rainbow-me/rainbow/releases/tag/v1.2.4-1)
### Changed
* Bugfixes for broken button animation
* Performance improvements for network calls
* Improved support for Sentry sourcemaps

## [1.2.3-1](https://github.com/rainbow-me/rainbow/releases/tag/v1.2.3-1)
### Changed
* Better biometric support
Expand Down
28 changes: 14 additions & 14 deletions ios/Rainbow.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@
13B07FB01A68108700A75B9A /* AppDelegate.m */,
13B07FB51A68108700A75B9A /* Images.xcassets */,
13B07FB61A68108700A75B9A /* Info.plist */,
13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
13B07FB71A68108700A75B9A /* main.m */,
13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
3CBE29CC2381E43900BE05AC /* Dummy.swift */,
3CBE29CB2381E43800BE05AC /* Rainbow-Bridging-Header.h */,
A4277D9E23CBD1910042BAF4 /* Extensions.swift */,
Expand Down Expand Up @@ -624,7 +624,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport NODE_ARGS=--max-old-space-size=2048\n../node_modules/@sentry/cli/bin/sentry-cli react-native xcode ../node_modules/react-native/scripts/react-native-xcode.sh\n";
shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport NODE_ARGS=--max-old-space-size=2048\nDEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $DEST/main.jsbundle.map\"\n../node_modules/@sentry/cli/bin/sentry-cli react-native xcode ../node_modules/react-native/scripts/react-native-xcode.sh\ncp $DEST/main.jsbundle* ../ios/\n";
};
3CF823D3218F310D0024B77B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -734,10 +734,10 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = L74NQAQB8H;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand All @@ -763,7 +763,7 @@
"\"$(SRCROOT)/Rainbow\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.2.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -791,9 +791,9 @@
CODE_SIGN_ENTITLEMENTS = Rainbow/Rainbow.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = L74NQAQB8H;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand All @@ -819,7 +819,7 @@
"\"$(SRCROOT)/Rainbow\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.2.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -883,9 +883,9 @@
CODE_SIGN_ENTITLEMENTS = Rainbow/Rainbow.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = L74NQAQB8H;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand All @@ -910,7 +910,7 @@
"\"$(SRCROOT)/Rainbow\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.2.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -975,9 +975,9 @@
CODE_SIGN_ENTITLEMENTS = Rainbow/Rainbow.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = L74NQAQB8H;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand All @@ -1002,7 +1002,7 @@
"\"$(SRCROOT)/Rainbow\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 1.2.2;
MARKETING_VERSION = 1.2.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
15 changes: 15 additions & 0 deletions ios/fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,26 @@ platform :ios do
download_dsyms(version: "latest")
upload_symbols_to_crashlytics
sentry_upload_dsym
sentry_create_release(
finalize: true # Whether to finalize the release. If not provided or false, the release can be finalized using the sentry_finalize_release action
)
sentry_upload_sourcemap(
sourcemap: './main.jsbundle', # file to upload
rewrite: true
)
sentry_upload_sourcemap(
sourcemap: './main.jsbundle.map', # sourcemap to upload
rewrite: true
)
clean_build_artifacts
end

desc "Submit a new Beta build to Apple TestFlight"
lane :beta do
increment_build_number({
build_number: latest_testflight_build_number + 1
})

update_info_plist(
plist_path: "Rainbow/Info.plist",
display_name: "Rainbow"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Rainbow",
"version": "1.2.3-1",
"version": "1.2.4-3",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
5 changes: 4 additions & 1 deletion src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import RNIOS11DeviceCheck from 'react-native-ios11-devicecheck';
import { SafeAreaProvider } from 'react-native-safe-area-context';
// eslint-disable-next-line import/no-unresolved
import { enableScreens } from 'react-native-screens';
import VersionNumber from 'react-native-version-number';
import { connect, Provider } from 'react-redux';
import { compose, withProps } from 'recompact';
import { FlexItem } from './components/layout';
Expand Down Expand Up @@ -55,7 +56,9 @@ if (__DEV__) {

CodePush.getUpdateMetadata().then(update => {
if (update) {
setRelease(update.appVersion + '-codepush:' + update.label);
setRelease(`me.rainbow-${update.appVersion}-codepush:${update.label}`);
} else {
setRelease(`me.rainbow-${VersionNumber.appVersion}`);
}
});

Expand Down