Skip to content

Commit

Permalink
WIP 2.
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewcarlreetz committed Sep 20, 2023
1 parent 22bc773 commit 6686071
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
11 changes: 11 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ def getAppVersion() {
}

android {
packagingOptions {
pickFirst 'lib/x86/libc++_shared.so'
pickFirst 'lib/x86_64/libc++_shared.so'
pickFirst 'lib/armeabi-v7a/libc++_shared.so'
pickFirst 'lib/arm64-v8a/libc++_shared.so'
}

ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion
Expand Down Expand Up @@ -171,6 +178,10 @@ dependencies {

implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")

implementation platform('org.jetbrains.kotlin:kotlin-bom:1.9.0')

implementation 'com.google.firebase:firebase-core:18.0.0'

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.squareup.okhttp3', module:'okhttp'
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ target 'HeliumWallet' do
end

target 'OneSignalNotificationServiceExtension' do
pod 'OneSignalXCFramework', '>= 3.0', '< 4.0'
pod 'OneSignalXCFramework', '>= 5.0.0', '< 6.0'
end

target 'HeliumWalletWidgetExtension' do
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@react-navigation/native-stack": "6.7.0",
"@react-navigation/stack": "6.2.2",
"@reduxjs/toolkit": "1.9.1",
"@rnmapbox/maps": "^10.0.7-rc.0",
"@rnmapbox/maps": "10.0.15",
"@shopify/restyle": "1.8.0",
"@solana/spl-account-compression": "0.1.4",
"@solana/spl-memo": "^0.2.3",
Expand Down Expand Up @@ -162,7 +162,7 @@
"react-native-mail": "^6.1.1",
"react-native-navigation-bar-color": "2.0.1",
"react-native-network-info": "5.2.1",
"react-native-onesignal": "4.4.1",
"react-native-onesignal": "5.0.0",
"react-native-os": "1.2.6",
"react-native-pager-view": "6.2.0",
"react-native-qrcode-svg": "6.1.2",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3752,7 +3752,7 @@
redux-thunk "^2.4.2"
reselect "^4.1.7"

"@rnmapbox/maps@^10.0.7-rc.0":
"@rnmapbox/[email protected].15":
version "10.0.15"
resolved "https://registry.yarnpkg.com/@rnmapbox/maps/-/maps-10.0.15.tgz#cf63c8eb6beffb22451718f148c2bea655a3cdb6"
integrity sha512-2diBwMF+e7gR6keZ1AEI3xw8U7Cu9+xhv8ce75Bw7flg9aTk+d0KgWv4VDQn4wSphD23EroUgFprVymHvVzZGQ==
Expand Down Expand Up @@ -13859,10 +13859,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/react-native-network-info/-/react-native-network-info-5.2.1.tgz#b701f10d4ed1aeadcfe77b197328d1ae846f6d3a"
integrity sha512-iam74xXtrSqqZurCl1/bSjZ9jXcsJY84g7brx1/4uVGCY26c6m+4CArHNSHOsz5ATg2NQT+81sjNy0KlCPyK4g==

react-native-onesignal@4.4.1:
version "4.4.1"
resolved "https://registry.yarnpkg.com/react-native-onesignal/-/react-native-onesignal-4.4.1.tgz#c79c94ea8622012adcd3d1e36ba91be6fa126453"
integrity sha512-vbS0E2TO5KljT0l1nAce04aOZF6FLv9oUaliffhFQR92oTHAbwNmwwMpxZF6CIcNANDDKkYtKPw5h7baUxmQdw==
react-native-onesignal@5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/react-native-onesignal/-/react-native-onesignal-5.0.0.tgz#c51b950dc8997b0dedfa6083efde9a1e4470b5b3"
integrity sha512-kIouwQoeMXmJeVg8mdvbtTisNejtlMlKW8sU7KdzAge9ZRezTr6ryVPHroiMdjnYBvmZ4UzCtZZrS+Aqarepbw==
dependencies:
invariant "^2.2.2"

Expand Down

0 comments on commit 6686071

Please sign in to comment.