From d036a3179b12c73686519f880ffcb8584ff711c1 Mon Sep 17 00:00:00 2001 From: Olivier Louvignes Date: Thu, 8 Feb 2024 11:44:26 +0100 Subject: [PATCH] chore(android): attempt working gradle sync --- android/build.gradle | 3 ++- android/settings.gradle | 5 +++++ package.json | 1 + pnpm-lock.yaml | 40 ++++++++++++++++++++++++++++++++++------ 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 6e62b3a..5c348ac 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -63,9 +63,10 @@ dependencies { // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native" - implementation "androidx.camera:camera-core:1.1.0-beta02" + implementation "com.facebook.react:react-android:+" implementation 'com.google.mlkit:barcode-scanning:17.2.0' implementation project(":react-native-vision-camera") + implementation project(":react-native-worklets-core") } if (isNewArchitectureEnabled()) { diff --git a/android/settings.gradle b/android/settings.gradle index ff8ec8c..3c3c539 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,2 +1,7 @@ include ':react-native-vision-camera' project(':react-native-vision-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vision-camera/android') + +include ':react-native-worklets-core' +project(':react-native-worklets-core').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-worklets-core/android') + +apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) \ No newline at end of file diff --git a/package.json b/package.json index e31c29a..9045717 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ }, "devDependencies": { "@mgcrea/eslint-config-react-native": "^0.9.5", + "@react-native-community/cli-platform-android": "^12.3.5", "@react-native-community/eslint-config": "^3.2.0", "@react-native/gradle-plugin": "^0.73.4", "@testing-library/jest-native": "^5.4.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index da7bbe0..f9a5105 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ devDependencies: '@mgcrea/eslint-config-react-native': specifier: ^0.9.5 version: 0.9.5(eslint@8.56.0)(prettier@3.2.4)(typescript@5.3.3) + '@react-native-community/cli-platform-android': + specifier: ^12.3.5 + version: 12.3.5 '@react-native-community/eslint-config': specifier: ^3.2.0 version: 3.2.0(eslint@8.56.0)(jest@29.7.0)(prettier@3.2.4)(typescript@5.3.3) @@ -2355,6 +2358,19 @@ packages: - encoding dev: true + /@react-native-community/cli-platform-android@12.3.5: + resolution: {integrity: sha512-vkoEoP2qKwdf8jxkrL2b35k+9eTNRFO9J6QhkVJS8AgSDcwLDvSEUCHoDBNCHaohFHP1wDWixYG4QwDOx+GfFw==} + dependencies: + '@react-native-community/cli-tools': 12.3.5 + chalk: 4.1.2 + execa: 5.1.1 + fast-xml-parser: 4.3.2 + glob: 7.2.3 + logkitty: 0.7.1 + transitivePeerDependencies: + - encoding + dev: true + /@react-native-community/cli-platform-ios@12.3.0: resolution: {integrity: sha512-H95Sgt3wT7L8V75V0syFJDtv4YgqK5zbu69ko4yrXGv8dv2EBi6qZP0VMmkqXDamoPm9/U7tDTdbcf26ctnLfg==} dependencies: @@ -2408,6 +2424,23 @@ packages: - encoding dev: true + /@react-native-community/cli-tools@12.3.5: + resolution: {integrity: sha512-Q7LKvu9pt3dR8XngcMfqo42XVEKzOad+4vaqRkpBUkKkZwXv41UFDxeK16NmUP87rDpHQNBbgCjJcpSq57hWsw==} + dependencies: + appdirsjs: 1.2.7 + chalk: 4.1.2 + find-up: 5.0.0 + mime: 2.6.0 + node-fetch: 2.7.0 + open: 6.4.0 + ora: 5.4.1 + semver: 7.5.4 + shell-quote: 1.8.1 + sudo-prompt: 9.2.1 + transitivePeerDependencies: + - encoding + dev: true + /@react-native-community/cli-types@12.3.0: resolution: {integrity: sha512-MgOkmrXH4zsGxhte4YqKL7d+N8ZNEd3w1wo56MZlhu5WabwCJh87wYpU5T8vyfujFLYOFuFK5jjlcbs8F4/WDw==} dependencies: @@ -3919,11 +3952,6 @@ packages: restore-cursor: 4.0.0 dev: true - /cli-spinners@2.9.1: - resolution: {integrity: sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==} - engines: {node: '>=6'} - dev: true - /cli-spinners@2.9.2: resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==} engines: {node: '>=6'} @@ -7399,7 +7427,7 @@ packages: bl: 4.1.0 chalk: 4.1.2 cli-cursor: 3.1.0 - cli-spinners: 2.9.1 + cli-spinners: 2.9.2 is-interactive: 1.0.0 is-unicode-supported: 0.1.0 log-symbols: 4.1.0