feat: iOS SDK 5+ and Android SDK updates

.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
+      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {

.gitignore

@@ -42,3 +42,5 @@ Thumbs.db
 
 *.tgz
 packages/**/angular/dist
+
+.nx/cache

.prettierignore

@@ -3,3 +3,5 @@
 /dist
 /coverage
 native-src
+
+/.nx/cache

apps/demo-angular/package.json

@@ -13,7 +13,7 @@
     "@nativescript/mlkit-selfie-segmentation": "file:../../dist/packages/mlkit-selfie-segmentation"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "8.8.0-alpha.7",
+    "@nativescript/ios": "~8.7.0"
   }
 }

apps/demo-angular/project.json

@@ -17,7 +17,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -29,7 +29,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -41,7 +41,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -52,10 +52,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["apps/demo-angular/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }

apps/demo-angular/tsconfig.json

@@ -13,7 +13,8 @@
       "@nativescript/mlkit-object-detection": ["packages/mlkit-object-detection/index.ts"],
       "@nativescript/mlkit-digital-ink-recognition": ["packages/mlkit-digital-ink-recognition/index.ts"],
       "@nativescript/mlkit-pose-detection": ["packages/mlkit-pose-detection/index.ts"],
-      "@nativescript/mlkit-selfie-segmentation": ["packages/mlkit-selfie-segmentation/index.ts"]
+      "@nativescript/mlkit-selfie-segmentation": ["packages/mlkit-selfie-segmentation/index.ts"],
+      "@nativescript/*": ["../../dist/packages/*"]
     }
   },
   "files": ["./references.d.ts", "./src/main.ts", "./src/polyfills.ts"],

apps/demo/package.json

@@ -16,7 +16,7 @@
     "@nativescript/mlkit-text-recognition": "file:../../packages/mlkit-text-recognition"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "8.8.0-alpha.8",
+    "@nativescript/ios": "~8.7.0"
   }
 }

apps/demo/project.json

@@ -17,7 +17,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -30,7 +30,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -43,7 +43,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -54,10 +54,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["apps/demo/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }

apps/demo/src/plugin-demos/mlkit-core.ts

@@ -69,7 +69,6 @@ export class DemoModel extends DemoSharedMlkitCore {
     try {
       const src = await ImageSource.fromUrl('https://www.jqueryscript.net/images/jQuery-Plugin-To-Generate-International-Article-Number-Barcode-EAN13.jpg');
 
-      console.log(src.android);
       const result = await detectWithStillImage(src, {
         detectorType: DetectionType.Barcode,
       });

apps/demo/tsconfig.json

@@ -15,7 +15,8 @@
       "@nativescript/mlkit-object-detection": ["../../packages/mlkit-object-detection/index.ts"],
       "@nativescript/mlkit-digital-ink-recognition": ["../../packages/mlkit-digital-ink-recognition/index.ts"],
       "@nativescript/mlkit-pose-detection": ["../../packages/mlkit-pose-detection/index.ts"],
-      "@nativescript/mlkit-selfie-segmentation": ["../../packages/mlkit-selfie-segmentation/index.ts"]
+      "@nativescript/mlkit-selfie-segmentation": ["../../packages/mlkit-selfie-segmentation/index.ts"],
+      "@nativescript/*": ["../../packages/*"]
     }
   }
 }

jest.config.ts

@@ -1,3 +1,3 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 export default { projects: [...getJestProjects()] };

migrations.json

@@ -0,0 +1,12 @@
+{
+  "migrations": [
+    {
+      "cli": "nx",
+      "version": "5.2.0",
+      "description": "Migrate tools to 5.2.0",
+      "implementation": "./src/migrations/update-5-2-0/update-5-2-0",
+      "package": "@nativescript/plugin-tools",
+      "name": "update-to-5.2.0"
+    }
+  ]
+}

nx.json

@@ -1,35 +1,42 @@
 {
-  "npmScope": "nativescript",
-  "affected": {
-    "defaultBase": "master"
-  },
   "workspaceLayout": {
     "appsDir": "apps",
     "libsDir": "packages"
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "nx/tasks-runners/default",
       "options": {
-        "cacheableOperations": ["build", "build.all", "lint", "test", "e2e"],
-        "runtimeCacheInputs": ["node -v"],
-        "parallel": 1,
-        "useDaemonProcess": false
+        "runtimeCacheInputs": ["node -v"]
       }
     }
   },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "namedInputs": {
     "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
-    "production": ["default", "!{projectRoot}/.eslintrc.json"]
+    "production": ["default", "!{projectRoot}/.eslintrc.json", "!{projectRoot}/src/test-setup.[jt]s"]
   },
   "targetDefaults": {
     "build": {
-      "inputs": ["production", "^production"]
+      "inputs": ["production", "^production"],
+      "cache": true
     },
     "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
+    },
+    "build.all": {
+      "cache": true
+    },
+    "test": {
+      "cache": true
+    },
+    "e2e": {
+      "cache": true
     }
-  }
+  },
+  "useDaemonProcess": false,
+  "parallel": 1,
+  "useInferencePlugins": false,
+  "defaultBase": "master"
 }

package.json

@@ -16,29 +16,29 @@
   },
   "private": true,
   "devDependencies": {
-    "@angular/animations": "^15.0.0",
-    "@angular/common": "^15.0.0",
-    "@angular/compiler": "^15.0.0",
-    "@angular/compiler-cli": "^15.0.0",
-    "@angular/core": "^15.0.0",
-    "@angular/forms": "^15.0.0",
-    "@angular/platform-browser": "^15.0.0",
-    "@angular/platform-browser-dynamic": "^15.0.0",
-    "@angular/router": "^15.0.0",
-    "@nativescript/angular": "^15.0.0",
-    "@nativescript/core": "~8.6.0",
-    "@nativescript/plugin-tools": "5.1.0",
-    "@nativescript/types": "~8.6.0",
+    "@angular/animations": "^17.0.0",
+    "@angular/common": "^17.0.0",
+    "@angular/compiler": "^17.0.0",
+    "@angular/compiler-cli": "^17.0.0",
+    "@angular/core": "^17.0.0",
+    "@angular/forms": "^17.0.0",
+    "@angular/platform-browser": "^17.0.0",
+    "@angular/platform-browser-dynamic": "^17.0.0",
+    "@angular/router": "^17.0.0",
+    "@nativescript/angular": "^17.0.0",
+    "@nativescript/core": "~8.7.0",
+    "@nativescript/plugin-tools": "5.2.5",
+    "@nativescript/types": "~8.7.0",
     "@nativescript/webpack": "~5.0.5",
-    "@ngtools/webpack": "^15.0.0",
-    "husky": "^8.0.0",
+    "@ngtools/webpack": "^17.0.0",
+    "husky": "~9.0.0",
     "nativescript-vue": "~2.9.0",
     "nativescript-vue-template-compiler": "~2.9.0",
-    "ng-packagr": "^15.0.0",
-    "rxjs": "~7.5.0",
-    "typescript": "~4.8.0",
-    "zone.js": "~0.13.0",
-    "@angular-devkit/build-angular": "^15.0.0"
+    "ng-packagr": "^17.0.0",
+    "rxjs": "~7.8.0",
+    "typescript": "~5.4.0",
+    "zone.js": "~0.14.0",
+    "@angular-devkit/build-angular": "^17.0.0"
   },
   "lint-staged": {
     "**/*.{js,ts,scss,json,html}": [

packages/mlkit-barcode-scanning/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/mlkit-barcode-scanning",
-  "version": "2.1.0",
+  "version": "3.0.0-alpha.7",
   "description": "NativeScript MLKit Barcode Scanner module",
   "main": "index",
   "typings": "index.d.ts",

packages/mlkit-barcode-scanning/platforms/android/include.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation 'io.github.triniwiz.fancycamera:barcodeScanning:1.0.2'
-    implementation 'com.google.mlkit:barcode-scanning:17.0.3'
+    implementation 'io.github.triniwiz:barcode-scanning:4.0.0-alpha.13'
+    implementation 'com.google.mlkit:barcode-scanning:17.2.0'
 }

packages/mlkit-barcode-scanning/platforms/ios/Podfile

@@ -1,2 +1,2 @@
-platform :ios, '11.0'
-pod 'GoogleMLKit/BarcodeScanning', '4.0.0'
+platform :ios, '15.5.0'
+pod 'GoogleMLKit/BarcodeScanning', '7.0.0'

packages/mlkit-barcode-scanning/project.json

@@ -5,7 +5,7 @@
   "sourceRoot": "packages/mlkit-barcode-scanning",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "options": {
         "outputPath": "dist/packages/mlkit-barcode-scanning",
         "tsConfig": "packages/mlkit-barcode-scanning/tsconfig.json",
@@ -24,7 +24,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -38,11 +38,10 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         },
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ]
     },
@@ -54,10 +53,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["packages/mlkit-barcode-scanning/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }

packages/mlkit-core/angular/.eslintrc.json

@@ -8,7 +8,7 @@
     {
       "files": ["*.ts", "*.tsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "allowCircularSelfDependency": true

packages/mlkit-core/common.ts

@@ -156,3 +156,11 @@ export const processEveryNthFrameProperty = new Property<MLKitViewBase, number>(
 });
 
 processEveryNthFrameProperty.register(MLKitViewBase);
+
+export const retrieveLatestImageProperty = new Property<MLKitViewBase, boolean>({
+  name: 'retrieveLatestImage',
+  defaultValue: false,
+  valueConverter: booleanConverter,
+});
+
+retrieveLatestImageProperty.register(MLKitViewBase);