Merge pull request #315 from OP-Engineering/oscar/get-rid-of-circular-dep

Author: ospfranco

.github/workflows/ci.yml

@@ -64,9 +64,8 @@ jobs:
           api-level: 29
           emulator-options: -no-window -no-boot-anim -no-audio -no-snapshot-load
           script: |
-            adb wait-for-device
-            adb shell input keyevent 82
             ./scripts/test-android.sh
+
   test-ios:
     runs-on: macos-latest
     steps:

example/ios/Podfile.lock

@@ -1289,6 +1289,75 @@ PODS:
     - React
   - react-native-restart (0.0.27):
     - React-Core
+  - react-native-safe-area-context (5.6.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - react-native-safe-area-context/common (= 5.6.1)
+    - react-native-safe-area-context/fabric (= 5.6.1)
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
+  - react-native-safe-area-context/common (5.6.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
+  - react-native-safe-area-context/fabric (5.6.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - react-native-safe-area-context/common
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
   - React-NativeModulesApple (0.81.0):
     - hermes-engine
     - React-callinvoker
@@ -1680,6 +1749,7 @@ DEPENDENCIES:
   - React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
   - react-native-http-bridge-refurbished (from `../node_modules/react-native-http-bridge-refurbished`)
   - react-native-restart (from `../node_modules/react-native-restart`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-oscompat (from `../node_modules/react-native/ReactCommon/oscompat`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
@@ -1795,6 +1865,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-http-bridge-refurbished"
   react-native-restart:
     :path: "../node_modules/react-native-restart"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
   React-NativeModulesApple:
     :path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
   React-oscompat:
@@ -1900,6 +1972,7 @@ SPEC CHECKSUMS:
   React-microtasksnativemodule: d7f49e916033c30e1f64bb6b91e5db6c619df220
   react-native-http-bridge-refurbished: 1bd13b32a8e62abe61bab809c26e2dcf21256ed7
   react-native-restart: 0bc732f4461709022a742bb29bcccf6bbc5b4863
+  react-native-safe-area-context: 42a1b4f8774b577d03b53de7326e3d5757fe9513
   React-NativeModulesApple: a93cccc5bd37290cf1e2f40cb32718e74df6e8b5
   React-oscompat: eef0d02e3175b37e2c0eb99f69df82ea2f85f943
   React-perflogger: 3e93a5384103e04f176c257ee463ba810254856c

example/package.json

@@ -6,7 +6,7 @@
     "android": "react-native run-android",
     "ios": "react-native run-ios --scheme='debug' --simulator='iPhone 16 Pro'",
     "run:ios:unused": "xcodebuild -workspace ios/OPSQLiteExample.xcworkspace -scheme release -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' clean build",
-    "run:ios": "react-native run-ios --scheme='release' --no-packager",
+    "run:ios:release": "react-native run-ios --scheme='release' --no-packager",
     "start": "react-native start",
     "pods": "cd ios && bundle exec pod install && rm -f .xcode.env.local",
     "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",
@@ -21,7 +21,8 @@
     "events": "^3.3.0",
     "nativewind": "^2.0.11",
     "react": "19.1.1",
-    "react-native": "0.81.0"
+    "react-native": "0.81.0",
+    "react-native-safe-area-context": "^5.6.1"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

example/src/App.tsx

@@ -14,6 +14,7 @@ import './tests'; // import all tests to register them
 export default function App() {
   const [results, setResults] = useState<any>(null);
   useEffect(() => {
+    // registerTests();
     runTests()
       .then(newResults => {
         setServerResults(allTestsPassed(newResults));

example/src/tests/blob.spec.ts renamed to example/src/tests/blob.ts

@@ -1,9 +1,13 @@
-import './blob.spec';
-import './constants.spec';
-import './dbsetup.spec';
-import './hooks.spec';
-import './preparedStatements.spec';
-import './queries.spec';
-import './reactive.spec';
-import './storage.spec';
-import './tokenizer.spec';
+import './blob';
+import './constants';
+import './dbsetup';
+import './hooks';
+import './preparedStatements';
+import './queries';
+import './reactive';
+import './storage';
+import './tokenizer';
+
+// export function registerTests() {
+//   queries();
+// }