Skip to content

Commit

Permalink
fix android build
Browse files Browse the repository at this point in the history
  • Loading branch information
tyler-whitman committed Oct 28, 2024
1 parent 2719d95 commit a5faa69
Show file tree
Hide file tree
Showing 7 changed files with 327 additions and 561 deletions.
9 changes: 0 additions & 9 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdkVersion rootProject.ext.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

namespace "com.helium.wallet"
defaultConfig {
applicationId "com.helium.wallet"
Expand Down Expand Up @@ -190,8 +185,4 @@ dependencies {
} else {
implementation jscFlavor
}

configurations.all {
resolutionStrategy { force 'androidx.work:work-runtime:2.6.0' }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.soloader.OpenSourceMergedSoMapping
import com.facebook.soloader.SoLoader
import expo.modules.ApplicationLifecycleDispatcher
import expo.modules.ReactNativeHostWrapper
Expand All @@ -32,8 +33,7 @@ class MainApplication : Application(), ReactApplication {

override fun onCreate() {
super.onCreate()
// If you opted-in for the New Architecture, we enable the TurboModule system
SoLoader.init(this, /* native exopackage */false)
SoLoader.init(this, OpenSourceMergedSoMapping)

if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
Expand Down
2 changes: 0 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ buildscript {
repositories {
google()
mavenCentral()
jcenter()
}
dependencies {
classpath("com.android.tools.build:gradle")
Expand All @@ -28,7 +27,6 @@ allprojects {
repositories {
google()
mavenCentral()
jcenter()
maven { url 'https://www.jitpack.io' }
maven {
// expo-camera bundles a custom com.google.android:cameraview
Expand Down
4 changes: 1 addition & 3 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"displayName": "Helium",
"expo": {
"scheme": "helium",
"plugins": [
"expo-secure-store"
]
"plugins": ["expo-secure-store"]
}
}
69 changes: 44 additions & 25 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ PODS:
- hermes-engine (0.76.0):
- hermes-engine/Pre-built (= 0.76.0)
- hermes-engine/Pre-built (0.76.0)
- MapboxCommon (23.9.1)
- MapboxCoreMaps (10.16.6):
- MapboxCommon (~> 23.9)
- MapboxMaps (10.16.6):
- MapboxCommon (= 23.9.1)
- MapboxCoreMaps (= 10.16.6)
- MapboxMobileEvents (= 1.0.10)
- Turf (= 2.7.0)
- MapboxMobileEvents (1.0.10)
- MapboxCommon (23.11.0)
- MapboxCoreMaps (10.19.1):
- MapboxCommon (~> 23.11)
- MapboxMaps (10.19.0):
- MapboxCommon (= 23.11.0)
- MapboxCoreMaps (= 10.19.1)
- MapboxMobileEvents (= 2.0.0)
- Turf (= 2.8.0)
- MapboxMobileEvents (2.0.0)
- MultiplatformBleAdapter (0.1.9)
- RCT-Folly (2024.01.01.00):
- boost
Expand Down Expand Up @@ -1705,8 +1705,27 @@ PODS:
- React-utils (= 0.76.0)
- RNCAsyncStorage (1.12.1):
- React-Core
- RNCClipboard (1.5.1):
- RNCClipboard (1.14.2):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNDeviceInfo (8.7.1):
- React-Core
- RNGestureHandler (2.20.2):
Expand All @@ -1732,16 +1751,16 @@ PODS:
- Yoga
- RNLocalize (1.4.3):
- React-Core
- rnmapbox-maps (10.1.18):
- MapboxMaps (~> 10.16.4)
- rnmapbox-maps (10.1.32):
- MapboxMaps (~> 10.19.0)
- React
- React-Core
- rnmapbox-maps/DynamicLibrary (= 10.1.18)
- rnmapbox-maps/DynamicLibrary (= 10.1.32)
- Turf
- rnmapbox-maps/DynamicLibrary (10.1.18):
- rnmapbox-maps/DynamicLibrary (10.1.32):
- DoubleConversion
- hermes-engine
- MapboxMaps (~> 10.16.4)
- MapboxMaps (~> 10.19.0)
- RCT-Folly
- RCTRequired
- RCTTypeSafety
Expand Down Expand Up @@ -1955,7 +1974,7 @@ PODS:
- Yoga
- SocketRocket (0.7.1)
- Toast (4.0.0)
- Turf (2.7.0)
- Turf (2.8.0)
- Yoga (0.0.0)
- ZXingObjC/Core (3.6.9)
- ZXingObjC/OneD (3.6.9):
Expand Down Expand Up @@ -2054,7 +2073,7 @@ DEPENDENCIES:
- ReactCodegen (from `build/generated/ios`)
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
- "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
- "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
- "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
- RNLocalize (from `../node_modules/react-native-localize`)
Expand Down Expand Up @@ -2256,7 +2275,7 @@ EXTERNAL SOURCES:
RNCAsyncStorage:
:path: "../node_modules/@react-native-community/async-storage"
RNCClipboard:
:path: "../node_modules/@react-native-community/clipboard"
:path: "../node_modules/@react-native-clipboard/clipboard"
RNDeviceInfo:
:path: "../node_modules/react-native-device-info"
RNGestureHandler:
Expand Down Expand Up @@ -2300,10 +2319,10 @@ SPEC CHECKSUMS:
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
helium-react-native-sdk: 17b612b2dacebc8f10c18ba5611f200a81c940f9
hermes-engine: 9de51d2f67336348a6cd5b686330e436d1dbd522
MapboxCommon: 20466d839cc43381c44df09d19f7f794b55b9a93
MapboxCoreMaps: c21f433decbb295874f0c2464e492166db813b56
MapboxMaps: c3b36646b9038706bbceb5de203bcdd0f411e9d0
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
MapboxCommon: 119f3759f7dc9457f0695848108ab323eb643cb4
MapboxCoreMaps: ca17f67baced23f8c952166ac6314c35bad3f66c
MapboxMaps: b7f29ec7c33f7dc6d2947c1148edce6db81db9a7
MapboxMobileEvents: d044b9edbe0ec7df60f6c2c9634fe9a7f449266b
MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
RCTDeprecation: 4c2c4a088b6f0ccfcbd53c9d5614b0238ad57909
Expand Down Expand Up @@ -2370,18 +2389,18 @@ SPEC CHECKSUMS:
ReactCodegen: dbfef1fef26f42c900bb1884fa149d49d501d64d
ReactCommon: 429ca28cd813c31359c73ffac6dc24f93347d522
RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCClipboard: e55ecafbf4e0e42409391a98aceea76278699036
RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
RNGestureHandler: fc5ce5bf284640d3af6431c3a5c3bc121e98d045
RNLocalize: 7c7aeda16c01db7a0918981c14875c0a53be9b79
rnmapbox-maps: 925e1a6a2ecf317391b7af03eb746c0b364295cb
rnmapbox-maps: 428a6a3c115ed1c5ff887bdbe240536c4b338b55
RNPermissions: f84a352792c6d017dac6bb96ee190f0c21d7e002
RNReanimated: 77242c6d67416988a2fd9f5cf574bb3e60016362
RNScreens: c1e151cab51643c0cf42b88d275592a4aee220f1
RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
Yoga: 1d66db49f38fd9e576a1d7c3b081e46ab4c28b9e
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

Expand Down
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@react-navigation/native": "^5.8.4",
"@react-navigation/stack": "^5.12.1",
"@reduxjs/toolkit": "^1.4.0",
"@rnmapbox/maps": "^10.1.31",
"@rnmapbox/maps": "^10.1.32",
"@shopify/restyle": "^1.3.1",
"@solana/web3.js": "^1.73.0",
"@types/tinycolor2": "^1.4.3",
Expand All @@ -76,15 +76,14 @@
"compare-versions": "^3.6.0",
"date-fns": "^2.16.1",
"deprecated-react-native-prop-types": "^2.3.0",
"expo": "52.0.0-preview.4",
"expo": "52.0.0-preview.7",
"expo-barcode-scanner": "~14.0.1",
"expo-camera": "~16.0.2",
"expo-camera": "~16.0.3",
"expo-haptics": "~14.0.0",
"expo-local-authentication": "~15.0.1",
"expo-location": "~18.0.1",
"expo-permissions": "^14.4.0",
"expo-secure-store": "~14.0.0",
"expo-splash-screen": "~0.28.2",
"expo-splash-screen": "~0.28.4",
"fuse.js": "^6.6.2",
"geojson2h3": "^1.1.1",
"h3-js": "^4.1.0",
Expand All @@ -110,8 +109,8 @@
"react-native-mail": "patch:react-native-mail@npm%3A6.1.1#~/.yarn/patches/react-native-mail-npm-6.1.1-89ecd5901e.patch",
"react-native-navigation-bar-color": "^2.0.1",
"react-native-permissions": "^3.7.3",
"react-native-reanimated": "^3.16.1",
"react-native-safe-area-context": "4.11.0",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "4.0.0-beta.14",
"react-native-simple-toast": "^1.1.4",
"react-native-snap-carousel": "^4.0.0-beta.6",
Expand Down Expand Up @@ -146,7 +145,7 @@
"@types/jest": "^29.2.1",
"@types/lodash": "^4.14.165",
"@types/qs": "^6.9.5",
"@types/react": "^18.2.6",
"@types/react": "~18.3.12",
"@types/react-redux": "^7.1.11",
"@types/react-test-renderer": "^18.0.0",
"@types/webpack-env": "^1.15.3",
Expand All @@ -169,18 +168,18 @@
"husky": "^4.3.0",
"jest": "^29.6.3",
"jest-circus": "^27.0.4",
"jest-expo": "~52.0.0-preview.1",
"jest-expo": "52.0.0-preview.1",
"lint-staged": "^10.5.1",
"metro-react-native-babel-preset": "0.73.10",
"pod-install": "0.1.38",
"prettier": "2.8.8",
"prettier-eslint": "^11.0.0",
"react-native-clean-project": "^4.0.3",
"react-native-cli-bump-version": "^1.1.0",
"react-native-svg-transformer": "^0.14.3",
"react-native-svg-transformer": "^1.5.0",
"react-test-renderer": "18.3.1",
"ts-jest": "^27.0.3",
"typescript": "^5.3.3"
"typescript": "~5.3.3"
},
"engines": {
"node": ">=18"
Expand Down
Loading

0 comments on commit a5faa69

Please sign in to comment.