Skip to content

SAF-210 - Fix debug build error with apache commons-io lib #775

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

Merged
tstirrat merged 9 commits into from
May 9, 2020
Merged

SAF-210 - Fix debug build error with apache commons-io lib #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf3f241
add a clean command for yarn for convenience. patch library and stop …
efalkner May 7, 2020
e0cdda7
update gitignore to not ignore yarn.lock
efalkner May 7, 2020
69d956d
add the updated lock file
efalkner May 7, 2020
b875970
revert previous patch
efalkner May 8, 2020
2d15c51
update patch to remove jetifier cruft
efalkner May 9, 2020
8120bd3
remove jetifier from yarn commands so it doesn't screw up patch-package
efalkner May 9, 2020
a97ff6f
Merge branch 'develop' of github.com:Path-Check/covid-safe-paths into…
efalkner May 9, 2020
9194d76
revert yarn.lock
tstirrat May 9, 2020
339b950
restore jetifier
tstirrat May 9, 2020
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ app/locales/*_old.json

# CocoaPods
/ios/Pods/
yarn.lock
.vscode/launch.json
ios/Podfile.lock

Expand Down
4 changes: 0 additions & 4 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,6 @@ dependencies {
allprojects {
repositories {
configurations.all {
// Fixes dependency conflict between react-native-local-assets and
// @mauron85/react-native-background-geolocation
exclude group: "commons-io", module: "commons-io"

// To fix the app start crash error
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
def requested = details.requested
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "1.0.1",
"private": true,
"scripts": {
"clean": "rm -rf node_modules && yarn",
"start": "yarn && react-native start",
"run-android": "react-native run-android",
"run-ios": "yarn install:pod && react-native run-ios",
Expand Down
Loading