diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 962fa8c..1a4a817 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -38,7 +38,17 @@ "Bash(openssl pkcs7 *)", "Bash(openssl x509 *)", "Bash(/opt/android-sdk/build-tools/34.0.0/apksigner verify *)", - "Bash(npm ci *)" + "Bash(npm ci *)", + "Bash(xxd)", + "WebFetch(domain:raw.githubusercontent.com)", + "Bash(git add *)", + "Bash(git commit *)", + "Bash(git push *)", + "WebFetch(domain:github.com)", + "WebSearch", + "WebFetch(domain:developers.google.com)", + "WebFetch(domain:cocoapods.org)", + "Bash(git check-ignore *)" ] } } diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index d17ceef..8da97a1 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -9,6 +9,7 @@ android { apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { + implementation project(':capacitor-mlkit-barcode-scanning') implementation project(':capacitor-app') implementation project(':capacitor-splash-screen') implementation project(':capacitor-status-bar') diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 3649457..e59b604 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -33,6 +33,10 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"> + + diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index df38bc9..31182bc 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -2,6 +2,9 @@ include ':capacitor-android' project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') +include ':capacitor-mlkit-barcode-scanning' +project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/@capacitor-mlkit/barcode-scanning/android') + include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 14d5c2a..531dda3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1662,6 +1662,7 @@ "url": "https://opencollective.com/capawesome" } ], + "license": "Apache-2.0", "peerDependencies": { "@capacitor/core": ">=8.0.0" } diff --git a/ios/App/Podfile b/ios/App/Podfile index a4b1cbf..7ef3ec7 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -11,8 +11,8 @@ install! 'cocoapods', :disable_input_output_paths => true, :warn_for_unused_mast def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' - pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/@capacitor-mlkit/barcode-scanning' + pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen' pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar' end diff --git a/package-lock.json b/package-lock.json index 5f7b713..71fdb62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "farma-finder", "version": "1.0.0", "dependencies": { + "@capacitor-mlkit/barcode-scanning": "^8.1.0", "@capacitor/android": "^8.4.1", "@capacitor/app": "^8.1.0", "@capacitor/core": "^8.4.1", @@ -20,6 +21,25 @@ "npm-run-all": "^4.1.5" } }, + "node_modules/@capacitor-mlkit/barcode-scanning": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@capacitor-mlkit/barcode-scanning/-/barcode-scanning-8.1.0.tgz", + "integrity": "sha512-lhOYHZINLOCT0i5YSbSMkouik3zh0BncJouumNTgXCT0/533Z4733jAX9zv+nEd++bE8QHeUl2g0NrewreumnQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/capawesome-team/" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/capawesome" + } + ], + "license": "Apache-2.0", + "peerDependencies": { + "@capacitor/core": ">=8.0.0" + } + }, "node_modules/@capacitor/android": { "version": "8.4.1", "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-8.4.1.tgz",