Skip to content

Commit e13b504

Browse files
Now it works on android and ios
1 parent 7b40601 commit e13b504

File tree

7 files changed

+23
-33
lines changed

7 files changed

+23
-33
lines changed

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3535
# your application. You should enable this flag either if you want
3636
# to write custom TurboModules/Fabric components OR use libraries that
3737
# are providing them.
38-
newArchEnabled=false
38+
newArchEnabled=true
3939

4040
# Use this property to enable or disable the Hermes JS engine.
4141
# If set to false, you will be using JSC instead.

ios/Podfile.lock

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ PODS:
5353
- libwebp/sharpyuv (1.3.2)
5454
- libwebp/webp (1.3.2):
5555
- libwebp/sharpyuv
56-
- MMKV (1.3.9):
57-
- MMKVCore (~> 1.3.9)
58-
- MMKVCore (1.3.9)
5956
- RCT-Folly (2024.11.18.00):
6057
- boost
6158
- DoubleConversion
@@ -1268,11 +1265,10 @@ PODS:
12681265
- React-Core
12691266
- react-native-get-random-values (1.11.0):
12701267
- React-Core
1271-
- react-native-mmkv (2.12.2):
1268+
- react-native-mmkv (3.3.0):
12721269
- DoubleConversion
12731270
- glog
12741271
- hermes-engine
1275-
- MMKV (>= 1.3.3)
12761272
- RCT-Folly (= 2024.11.18.00)
12771273
- RCTRequired
12781274
- RCTTypeSafety
@@ -2097,8 +2093,6 @@ SPEC REPOS:
20972093
trunk:
20982094
- DGCharts
20992095
- libwebp
2100-
- MMKV
2101-
- MMKVCore
21022096
- SDWebImage
21032097
- SDWebImageWebPCoder
21042098
- SocketRocket
@@ -2299,8 +2293,6 @@ SPEC CHECKSUMS:
22992293
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
23002294
hermes-engine: 1f783c3d53940aed0d2c84586f0b7a85ab7827ef
23012295
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
2302-
MMKV: 817ba1eea17421547e01e087285606eb270a8dcb
2303-
MMKVCore: af055b00e27d88cd92fad301c5fecd1ff9b26dd9
23042296
RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
23052297
RCTDeprecation: f5c19ebdb8804b53ed029123eb69914356192fc8
23062298
RCTRequired: 6ae6cebe470486e0e0ce89c1c0eabb998e7c51f4
@@ -2333,7 +2325,7 @@ SPEC CHECKSUMS:
23332325
react-native-charts-wrapper: cd83d9b1acb8e06ebd18bf297de597906e1cc87d
23342326
react-native-config: 3367df9c1f25bb96197007ec531c7087ed4554c3
23352327
react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
2336-
react-native-mmkv: 13b9a967a51e3af22db2ab7248c7fe758c9ee4b0
2328+
react-native-mmkv: a578df102150a1742d11e741b581bc63edef9771
23372329
react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac
23382330
react-native-safe-area-context: 09eb8ca73a7036119cce20de22f64fe245a1acfb
23392331
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
@@ -2382,7 +2374,7 @@ SPEC CHECKSUMS:
23822374
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
23832375
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
23842376
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
2385-
Yoga: 78d74e245ed67bb94275a1316cdc170b9b7fe884
2377+
Yoga: c0d8564af14a858f962607cd7306539cb2ace926
23862378

23872379
PODFILE CHECKSUM: 236a2187fcbe084e16792ff6d57013e36a11638e
23882380

ios/opendtureactnative.xcodeproj/project.pbxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,10 @@
299299
inputFileListPaths = (
300300
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks-${CONFIGURATION}-input-files.xcfilelist",
301301
);
302-
inputPaths = (
303-
);
304302
name = "[CP] Embed Pods Frameworks";
305303
outputFileListPaths = (
306304
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks-${CONFIGURATION}-output-files.xcfilelist",
307305
);
308-
outputPaths = (
309-
);
310306
runOnlyForDeploymentPostprocessing = 0;
311307
shellPath = /bin/sh;
312308
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks.sh\"\n";
@@ -361,14 +357,10 @@
361357
inputFileListPaths = (
362358
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources-${CONFIGURATION}-input-files.xcfilelist",
363359
);
364-
inputPaths = (
365-
);
366360
name = "[CP] Copy Pods Resources";
367361
outputFileListPaths = (
368362
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources-${CONFIGURATION}-output-files.xcfilelist",
369363
);
370-
outputPaths = (
371-
);
372364
runOnlyForDeploymentPostprocessing = 0;
373365
shellPath = /bin/sh;
374366
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources.sh\"\n";
@@ -686,7 +678,10 @@
686678
"-DFOLLY_CFG_NO_COROUTINES=1",
687679
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
688680
);
689-
OTHER_LDFLAGS = "$(inherited) ";
681+
OTHER_LDFLAGS = (
682+
"$(inherited)",
683+
" ",
684+
);
690685
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
691686
SDKROOT = iphoneos;
692687
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -761,7 +756,10 @@
761756
"-DFOLLY_CFG_NO_COROUTINES=1",
762757
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
763758
);
764-
OTHER_LDFLAGS = "$(inherited) ";
759+
OTHER_LDFLAGS = (
760+
"$(inherited)",
761+
" ",
762+
);
765763
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
766764
SDKROOT = iphoneos;
767765
SWIFT_COMPILATION_MODE = wholemodule;

ios/opendtureactnative/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ReactAppDependencyProvider
66
@main
77
class AppDelegate: RCTAppDelegate {
88
override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
9-
self.moduleName = "RnDiffApp"
9+
self.moduleName = "opendtureactnative"
1010
self.dependencyProvider = RCTAppDependencyProvider()
1111

1212
// You can add your custom initial props in the dictionary below.

licenses.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@
227227
"licenseUrl": "https://github.com/iamacup/react-native-markdown-display/raw/master/LICENSE",
228228
"parents": "opendtu-react-native"
229229
},
230-
"react-native-mmkv@2.12.2": {
230+
"react-native-mmkv@3.3.0": {
231231
"licenses": "(MIT AND BSD-3-Clause)",
232232
"repository": "https://github.com/mrousavy/react-native-mmkv",
233-
"licenseUrl": "https://github.com/mrousavy/react-native-mmkv/raw/master/LICENSE",
233+
"licenseUrl": "https://github.com/mrousavy/react-native-mmkv",
234234
"parents": "opendtu-react-native"
235235
},
236236

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"translations:pull": "bash -c \"pushd src/translations/translation-files ; git pull ; popd\"",
3030
"precommit-hooks": "bash -c \".git/hooks/pre-commit\"",
3131
"fix-imports": "./fix-imports.mjs",
32-
"pod-install": "cd ios && pod install"
32+
"pod-install": "cd ios && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install"
3333
},
3434
"dependencies": {
3535
"@octokit/rest": "^22.0.0",
@@ -72,7 +72,7 @@
7272
"react-native-localize": "^3.4.2",
7373
"react-native-logs": "^5.3.0",
7474
"react-native-markdown-display": "^7.0.2",
75-
"react-native-mmkv": "~2.12.2",
75+
"react-native-mmkv": "~3.3.0",
7676
"react-native-paper": "5.14.5",
7777
"react-native-paper-dates": "^0.22.47",
7878
"react-native-reanimated": "^3.16.7",

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13123,7 +13123,7 @@ __metadata:
1312313123
react-native-localize: "npm:^3.4.2"
1312413124
react-native-logs: "npm:^5.3.0"
1312513125
react-native-markdown-display: "npm:^7.0.2"
13126-
react-native-mmkv: "npm:~2.12.2"
13126+
react-native-mmkv: "npm:~3.3.0"
1312713127
react-native-paper: "npm:5.14.5"
1312813128
react-native-paper-dates: "npm:^0.22.47"
1312913129
react-native-reanimated: "npm:^3.16.7"
@@ -14022,13 +14022,13 @@ __metadata:
1402214022
languageName: node
1402314023
linkType: hard
1402414024

14025-
"react-native-mmkv@npm:~2.12.2":
14026-
version: 2.12.2
14027-
resolution: "react-native-mmkv@npm:2.12.2"
14025+
"react-native-mmkv@npm:~3.3.0":
14026+
version: 3.3.0
14027+
resolution: "react-native-mmkv@npm:3.3.0"
1402814028
peerDependencies:
1402914029
react: "*"
14030-
react-native: ">=0.71.0"
14031-
checksum: 10/c1ebb8e81905ee8ce17858ff6096525cbdd0e51892dca80a3cd6e26feb5e979a9c7d609c5a55886150efb0136c5899de174c71115f81607019ed7af68678797b
14030+
react-native: "*"
14031+
checksum: 10/809f89f0192eb856ca4a0cc931ba26d6e383da154ccbf23160b89c4c4fcbb8c2bc8976ad921a75ad5170f60bc6991cadf8c41579b4ca9bb892b0b7a10e2689f4
1403214032
languageName: node
1403314033
linkType: hard
1403414034

0 commit comments

Comments
 (0)