Skip to content

Commit d14705c

Browse files
authored
Merge pull request #14 from imanshul/hotfix
added support for 16kb app size, fixed issue with new architecture, fixed linting issues, updated readme
2 parents 03216a3 + f013410 commit d14705c

13 files changed

Lines changed: 93 additions & 150 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
${{ runner.os }}-cocoapods-
143143
144144
- name: Install cocoapods
145-
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
145+
if: env.turbo_cache_hit != 1
146146
run: |
147147
cd example/ios
148148
pod install

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@ lib/
7979

8080
#iOS
8181
ios/.xcode.env.local
82+
example/ios/.xcode.env.local

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ Remember! Detecting and hiding root are a cat and mouse game.
88

99
<a href="https://www.buymeacoffee.com/anshulthakur" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="41" width="174"></a>
1010

11+
## 🚀 What’s New
12+
### ✨ v0.1.7 🆕
13+
- Added support for **React Native New Architecture** (TurboModules & Codegen compatible)
14+
- Added support for **Android 16KB page size builds**
15+
1116
## Installation
1217

1318
```sh

android/src/main/jni/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ add_library( # Sets the name of the library.
2828
# Provides a relative path to your source file(s).
2929
${SOURCE_LIB})
3030

31+
# Enable 16KB page size support for Android 15+
32+
target_link_options(native-lib PRIVATE -Wl,-z,max-page-size=16384)
33+
3134
# Searches for a specified prebuilt library and stores the path as a
3235
# variable. Because CMake includes system libraries in the search path by
3336
# default, you only need to specify the name of the public NDK library

example/ios/.xcode.env.local

Lines changed: 0 additions & 2 deletions
This file was deleted.

example/ios/DetectFridaExample.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,15 +574,15 @@
574574
ONLY_ACTIVE_ARCH = YES;
575575
OTHER_CFLAGS = (
576576
"$(inherited)",
577-
"-DRN_FABRIC_ENABLED",
577+
" ",
578578
);
579579
OTHER_CPLUSPLUSFLAGS = (
580580
"$(OTHER_CFLAGS)",
581581
"-DFOLLY_NO_CONFIG",
582582
"-DFOLLY_MOBILE=1",
583583
"-DFOLLY_USE_LIBCPP=1",
584584
"-DFOLLY_CFG_NO_COROUTINES=1",
585-
"-DRN_FABRIC_ENABLED",
585+
" ",
586586
);
587587
OTHER_LDFLAGS = (
588588
"$(inherited)",
@@ -649,15 +649,15 @@
649649
MTL_ENABLE_DEBUG_INFO = NO;
650650
OTHER_CFLAGS = (
651651
"$(inherited)",
652-
"-DRN_FABRIC_ENABLED",
652+
" ",
653653
);
654654
OTHER_CPLUSPLUSFLAGS = (
655655
"$(OTHER_CFLAGS)",
656656
"-DFOLLY_NO_CONFIG",
657657
"-DFOLLY_MOBILE=1",
658658
"-DFOLLY_USE_LIBCPP=1",
659659
"-DFOLLY_CFG_NO_COROUTINES=1",
660-
"-DRN_FABRIC_ENABLED",
660+
" ",
661661
);
662662
OTHER_LDFLAGS = (
663663
"$(inherited)",

example/ios/Podfile.lock

Lines changed: 46 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ PODS:
33
- CocoaAsyncSocket (7.6.5)
44
- DoubleConversion (1.1.6)
55
- FBLazyVector (0.73.6)
6+
- FBReactNativeSpec (0.73.6):
7+
- RCT-Folly (= 2022.05.16.00)
8+
- RCTRequired (= 0.73.6)
9+
- RCTTypeSafety (= 0.73.6)
10+
- React-Core (= 0.73.6)
11+
- React-jsi (= 0.73.6)
12+
- ReactCommon/turbomodule/core (= 0.73.6)
613
- Flipper (0.201.0):
714
- Flipper-Folly (~> 2.6)
815
- Flipper-Boost-iOSX (1.76.0.1.11)
@@ -109,21 +116,17 @@ PODS:
109116
- React-callinvoker (0.73.6)
110117
- React-Codegen (0.73.6):
111118
- DoubleConversion
119+
- FBReactNativeSpec
112120
- glog
113121
- hermes-engine
114122
- RCT-Folly
115123
- RCTRequired
116124
- RCTTypeSafety
117125
- React-Core
118-
- React-debug
119-
- React-Fabric
120-
- React-FabricImage
121-
- React-graphics
122126
- React-jsi
123127
- React-jsiexecutor
124128
- React-NativeModulesApple
125-
- React-rendererdebug
126-
- React-utils
129+
- React-rncore
127130
- ReactCommon/turbomodule/bridging
128131
- ReactCommon/turbomodule/core
129132
- React-Core (0.73.6):
@@ -936,32 +939,15 @@ PODS:
936939
- React-jsi (= 0.73.6)
937940
- React-perflogger (= 0.73.6)
938941
- React-jsinspector (0.73.6)
939-
- React-jsitracing (0.73.6):
940-
- React-jsi
941942
- React-logger (0.73.6):
942943
- glog
943944
- React-Mapbuffer (0.73.6):
944945
- glog
945946
- React-debug
946-
- react-native-detect-frida (0.1.5):
947+
- react-native-detect-frida (0.1.7):
947948
- glog
948-
- hermes-engine
949949
- RCT-Folly (= 2022.05.16.00)
950-
- RCTRequired
951-
- RCTTypeSafety
952-
- React-Codegen
953950
- React-Core
954-
- React-debug
955-
- React-Fabric
956-
- React-graphics
957-
- React-ImageManager
958-
- React-NativeModulesApple
959-
- React-RCTFabric
960-
- React-rendererdebug
961-
- React-utils
962-
- ReactCommon/turbomodule/bridging
963-
- ReactCommon/turbomodule/core
964-
- Yoga
965951
- React-nativeconfig (0.73.6)
966952
- React-NativeModulesApple (0.73.6):
967953
- glog
@@ -990,21 +976,13 @@ PODS:
990976
- RCTTypeSafety
991977
- React-Core
992978
- React-CoreModules
993-
- React-debug
994-
- React-Fabric
995-
- React-graphics
996979
- React-hermes
997980
- React-nativeconfig
998981
- React-NativeModulesApple
999982
- React-RCTFabric
1000983
- React-RCTImage
1001984
- React-RCTNetwork
1002-
- React-rendererdebug
1003-
- React-RuntimeApple
1004-
- React-RuntimeCore
1005-
- React-RuntimeHermes
1006985
- React-runtimescheduler
1007-
- React-utils
1008986
- ReactCommon
1009987
- React-RCTBlob (0.73.6):
1010988
- hermes-engine
@@ -1082,42 +1060,8 @@ PODS:
10821060
- RCT-Folly (= 2022.05.16.00)
10831061
- React-debug
10841062
- React-rncore (0.73.6)
1085-
- React-RuntimeApple (0.73.6):
1086-
- hermes-engine
1087-
- RCT-Folly/Fabric (= 2022.05.16.00)
1088-
- React-callinvoker
1089-
- React-Core/Default
1090-
- React-CoreModules
1091-
- React-cxxreact
1092-
- React-jserrorhandler
1093-
- React-jsi
1094-
- React-jsiexecutor
1095-
- React-Mapbuffer
1096-
- React-NativeModulesApple
1097-
- React-RCTFabric
1098-
- React-RuntimeCore
1099-
- React-runtimeexecutor
1100-
- React-RuntimeHermes
1101-
- React-utils
1102-
- React-RuntimeCore (0.73.6):
1103-
- glog
1104-
- hermes-engine
1105-
- RCT-Folly/Fabric (= 2022.05.16.00)
1106-
- React-cxxreact
1107-
- React-jserrorhandler
1108-
- React-jsi
1109-
- React-jsiexecutor
1110-
- React-runtimeexecutor
1111-
- React-runtimescheduler
11121063
- React-runtimeexecutor (0.73.6):
11131064
- React-jsi (= 0.73.6)
1114-
- React-RuntimeHermes (0.73.6):
1115-
- hermes-engine
1116-
- RCT-Folly/Fabric (= 2022.05.16.00)
1117-
- React-jsi
1118-
- React-jsitracing
1119-
- React-nativeconfig
1120-
- React-utils
11211065
- React-runtimescheduler (0.73.6):
11221066
- glog
11231067
- hermes-engine
@@ -1178,6 +1122,7 @@ DEPENDENCIES:
11781122
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
11791123
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
11801124
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
1125+
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
11811126
- Flipper (= 0.201.0)
11821127
- Flipper-Boost-iOSX (= 1.76.0.1.11)
11831128
- Flipper-DoubleConversion (= 3.2.0.1)
@@ -1224,7 +1169,6 @@ DEPENDENCIES:
12241169
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
12251170
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
12261171
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`)
1227-
- React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`)
12281172
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
12291173
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
12301174
- react-native-detect-frida (from `../..`)
@@ -1244,10 +1188,7 @@ DEPENDENCIES:
12441188
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
12451189
- React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`)
12461190
- React-rncore (from `../node_modules/react-native/ReactCommon`)
1247-
- React-RuntimeApple (from `../node_modules/react-native/ReactCommon/react/runtime/platform/ios`)
1248-
- React-RuntimeCore (from `../node_modules/react-native/ReactCommon/react/runtime`)
12491191
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
1250-
- React-RuntimeHermes (from `../node_modules/react-native/ReactCommon/react/runtime`)
12511192
- React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
12521193
- React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
12531194
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
@@ -1276,6 +1217,8 @@ EXTERNAL SOURCES:
12761217
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
12771218
FBLazyVector:
12781219
:path: "../node_modules/react-native/Libraries/FBLazyVector"
1220+
FBReactNativeSpec:
1221+
:path: "../node_modules/react-native/React/FBReactNativeSpec"
12791222
glog:
12801223
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
12811224
hermes-engine:
@@ -1319,8 +1262,6 @@ EXTERNAL SOURCES:
13191262
:path: "../node_modules/react-native/ReactCommon/jsiexecutor"
13201263
React-jsinspector:
13211264
:path: "../node_modules/react-native/ReactCommon/jsinspector-modern"
1322-
React-jsitracing:
1323-
:path: "../node_modules/react-native/ReactCommon/hermes/executor/"
13241265
React-logger:
13251266
:path: "../node_modules/react-native/ReactCommon/logger"
13261267
React-Mapbuffer:
@@ -1359,14 +1300,8 @@ EXTERNAL SOURCES:
13591300
:path: "../node_modules/react-native/ReactCommon/react/renderer/debug"
13601301
React-rncore:
13611302
:path: "../node_modules/react-native/ReactCommon"
1362-
React-RuntimeApple:
1363-
:path: "../node_modules/react-native/ReactCommon/react/runtime/platform/ios"
1364-
React-RuntimeCore:
1365-
:path: "../node_modules/react-native/ReactCommon/react/runtime"
13661303
React-runtimeexecutor:
13671304
:path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
1368-
React-RuntimeHermes:
1369-
:path: "../node_modules/react-native/ReactCommon/react/runtime"
13701305
React-runtimescheduler:
13711306
:path: "../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler"
13721307
React-utils:
@@ -1381,6 +1316,7 @@ SPEC CHECKSUMS:
13811316
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
13821317
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
13831318
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
1319+
FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780
13841320
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
13851321
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
13861322
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@@ -1394,52 +1330,48 @@ SPEC CHECKSUMS:
13941330
hermes-engine: 9cecf9953a681df7556b8cc9c74905de8f3293c0
13951331
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
13961332
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
1397-
RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
1333+
RCT-Folly: cd21f1661364f975ae76b3308167ad66b09f53f5
13981334
RCTRequired: ca1d7414aba0b27efcfa2ccd37637edb1ab77d96
13991335
RCTTypeSafety: 678e344fb976ff98343ca61dc62e151f3a042292
14001336
React: e296bcebb489deaad87326067204eb74145934ab
14011337
React-callinvoker: d0b7015973fa6ccb592bb0363f6bc2164238ab8c
1402-
React-Codegen: df86ee5fa0498fb4d1c7e6ac324a58b7fdffbbaa
1403-
React-Core: 44c936d0ab879e9c32e5381bd7596a677c59c974
1404-
React-CoreModules: 558228e12cddb9ca00ff7937894cc5104a21be6b
1405-
React-cxxreact: 1fcf565012c203655b3638f35aa03c13c2ed7e9e
1338+
React-Codegen: a89833d9b3ccafeb8cc7b2e87800aad8903b8990
1339+
React-Core: 3c065b603637303cd150644b633e0b8980d258f1
1340+
React-CoreModules: 069bdb1c6013215afe85fb9627569dc1f21b8f44
1341+
React-cxxreact: a1ec4ab2c051f62ab752b86acb3ab1498d46d82f
14061342
React-debug: d444db402065cca460d9c5b072caab802a04f729
1407-
React-Fabric: 7d11905695e42f8bdaedddcf294959b43b290ab8
1408-
React-FabricImage: 6e06a512d2fb5f55669c721578736785d915d4f5
1409-
React-graphics: 5500206f7c9a481456365403c9fcf1638de108b7
1410-
React-hermes: 783023e43af9d6be4fbaeeb96b5beee00649a5f7
1411-
React-ImageManager: df193215ff3cf1a8dad297e554c89c632e42436c
1412-
React-jserrorhandler: a4d0f541c5852cf031db2f82f51de90be55b1334
1413-
React-jsi: ae102ccb38d2e4d0f512b7074d0c9b4e1851f402
1414-
React-jsiexecutor: bd12ec75873d3ef0a755c11f878f2c420430f5a9
1343+
React-Fabric: 30d61b17f5ec61b8f69e074d359a942c8edb48ed
1344+
React-FabricImage: 52209c0a7828893788d89b342657747fff852e52
1345+
React-graphics: 2d3bb1c23fb71e7dc0f25e1c13f9cd8a0f331166
1346+
React-hermes: 2b8dd8fa2082a7e219cd329ee1c5eec18b82b206
1347+
React-ImageManager: 37eeded59dc2bac8d76c9f78f421980c972215b6
1348+
React-jserrorhandler: 1ddd1e3e596bd3846ad81d2aa7ca3946c15b9ed0
1349+
React-jsi: 84c4e48ed0a563c9e103514ea9572bac486a61a1
1350+
React-jsiexecutor: 6206f71ec0fe8e0d5db321a7f7d91922d310fee9
14151351
React-jsinspector: 85583ef014ce53d731a98c66a0e24496f7a83066
1416-
React-jsitracing: 4fed160d939e93a39049481f47744af246a7ac2c
1417-
React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec
1418-
React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab
1419-
react-native-detect-frida: fd739334c31f278235f28c126842fab57c585d04
1352+
React-logger: 55764cd993880c6f887505854581c9faf68feff2
1353+
React-Mapbuffer: 15dfcfeb4428d8799cce75e7fe85b18b706029e0
1354+
react-native-detect-frida: 83e727ee6957dfdeae95e7a045a2fb10976e90a3
14201355
React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f
1421-
React-NativeModulesApple: cd26e56d56350e123da0c1e3e4c76cb58a05e1ee
1356+
React-NativeModulesApple: 541d64309a3037060cc416db5c8a63ee5884048e
14221357
React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2
14231358
React-RCTActionSheet: 37edf35aeb8e4f30e76c82aab61f12d1b75c04ec
1424-
React-RCTAnimation: a69de7f3daa8462743094f4736c455e844ea63f7
1425-
React-RCTAppDelegate: 5d3238045cfc5d6b157550e62c3cb6e2f7f2a5a6
1426-
React-RCTBlob: d91771caebf2d015005d750cd1dc2b433ad07c99
1427-
React-RCTFabric: 910a000f2470943ef39edc606f065fb61b138401
1428-
React-RCTImage: a0bfe87b6908c7b76bd7d74520f40660bd0ad881
1429-
React-RCTLinking: 5f10be1647952cceddfa1970fdb374087582fc34
1430-
React-RCTNetwork: a0bc3dd45a2dc7c879c80cebb6f9707b2c8bbed6
1431-
React-RCTSettings: 28c202b68afa59afb4067510f2c69c5a530fb9e3
1432-
React-RCTText: 4119d9e53ca5db9502b916e1b146e99798986d21
1433-
React-RCTVibration: 55bd7c48487eb9a2562f2bd3fdc833274f5b0636
1434-
React-rendererdebug: 5fa97ba664806cee4700e95aec42dff1b6f8ea36
1435-
React-rncore: a3534bcdcf253f7ecc1f0ee36bfe8f4035ea1432
1436-
React-RuntimeApple: c9886b8729f1e2fd5a551e54c617391d5172140e
1437-
React-RuntimeCore: 17e41e15c4933e0a127317e8ba0e582210a24fdc
1359+
React-RCTAnimation: b49b2e3beffa553e2120ef0767ce99b4591893c4
1360+
React-RCTAppDelegate: 95e826d48b372cb5c90947c72667f3ce86e77009
1361+
React-RCTBlob: c88cdc50aa116f53353b82d2d394d49e1de47ad3
1362+
React-RCTFabric: b6f90f1bfd1f601e66f4deeb9b21e217c6fb6b69
1363+
React-RCTImage: 665aaf80481423b2e896dcc67afa72e5993a2a4c
1364+
React-RCTLinking: a9321777212cf50b396983b4f3b3190fbfe53aa8
1365+
React-RCTNetwork: 4726e738c784679902d8425bd02c78f7e69d2ebf
1366+
React-RCTSettings: 4831390d89a911f10f154d5c440f6312f8aebe3d
1367+
React-RCTText: 7b1451059ba1d2c40f057c58211864c5e81e90a4
1368+
React-RCTVibration: d23654befc1d9eda8b69b0e9d4127800abcae76f
1369+
React-rendererdebug: ec22f2e3e545bd0ad15abc6e5710595ccfe45c94
1370+
React-rncore: b0a8e1d14dabb7115c7a5b4ec8b9b74d1727d382
14381371
React-runtimeexecutor: bb328dbe2865f3a550df0240df8e2d8c3aaa4c57
1439-
React-RuntimeHermes: a4a1f5e24555292aa6a5f176fc41ad51878220d3
1440-
React-runtimescheduler: 9636eee762c699ca7c85751a359101797e4c8b3b
1441-
React-utils: d16c1d2251c088ad817996621947d0ac8167b46c
1442-
ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10
1372+
React-runtimescheduler: a01dfb7ca980edebcc7d2d289ca900dea5d7e28b
1373+
React-utils: 288c9cb9a73bb150c273c84df7c2f8546f28e23f
1374+
ReactCommon: 2e5492a3e3a8e72d635c266405e49d12627e5bf0
14431375
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
14441376
Yoga: 805bf71192903b20fc14babe48080582fee65a80
14451377

example/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Text,
99
View,
1010
} from 'react-native';
11-
import { isDeviceRooted } from 'react-native-detect-frida';
11+
import { isDeviceRooted, type CheckStatus } from 'react-native-detect-frida';
1212

1313
export default function App() {
1414
const [rooted, setRooted] = React.useState<string | undefined>();

0 commit comments

Comments
 (0)