Skip to content

Commit f038a0a

Browse files
authored
feat: iOS SDK 5+ and Android SDK updates (#63)
1 parent 7c74292 commit f038a0a

File tree

61 files changed

+2111
-1962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2111
-1962
lines changed

.eslintrc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
26+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
2727
"rules": {}
2828
},
2929
{
3030
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
31+
"extends": ["plugin:@nx/javascript"],
3232
"rules": {}
3333
},
3434
{

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ Thumbs.db
4242

4343
*.tgz
4444
packages/**/angular/dist
45+
46+
.nx/cache

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
/dist
44
/coverage
55
native-src
6+
7+
/.nx/cache

apps/demo-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@nativescript/mlkit-selfie-segmentation": "file:../../dist/packages/mlkit-selfie-segmentation"
1414
},
1515
"devDependencies": {
16-
"@nativescript/android": "~8.6.0",
17-
"@nativescript/ios": "~8.6.0"
16+
"@nativescript/android": "8.8.0-alpha.7",
17+
"@nativescript/ios": "~8.7.0"
1818
}
1919
}

apps/demo-angular/project.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependsOn": [
1818
{
1919
"target": "build.all",
20-
"projects": "dependencies"
20+
"dependencies": true
2121
}
2222
]
2323
},
@@ -29,7 +29,7 @@
2929
"dependsOn": [
3030
{
3131
"target": "build.all",
32-
"projects": "dependencies"
32+
"dependencies": true
3333
}
3434
]
3535
},
@@ -41,7 +41,7 @@
4141
"dependsOn": [
4242
{
4343
"target": "build.all",
44-
"projects": "dependencies"
44+
"dependencies": true
4545
}
4646
]
4747
},
@@ -52,10 +52,7 @@
5252
}
5353
},
5454
"lint": {
55-
"executor": "@nrwl/linter:eslint",
56-
"options": {
57-
"lintFilePatterns": ["apps/demo-angular/**/*.ts"]
58-
}
55+
"executor": "@nx/eslint:lint"
5956
}
6057
}
6158
}

apps/demo-angular/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"@nativescript/mlkit-object-detection": ["packages/mlkit-object-detection/index.ts"],
1414
"@nativescript/mlkit-digital-ink-recognition": ["packages/mlkit-digital-ink-recognition/index.ts"],
1515
"@nativescript/mlkit-pose-detection": ["packages/mlkit-pose-detection/index.ts"],
16-
"@nativescript/mlkit-selfie-segmentation": ["packages/mlkit-selfie-segmentation/index.ts"]
16+
"@nativescript/mlkit-selfie-segmentation": ["packages/mlkit-selfie-segmentation/index.ts"],
17+
"@nativescript/*": ["../../dist/packages/*"]
1718
}
1819
},
1920
"files": ["./references.d.ts", "./src/main.ts", "./src/polyfills.ts"],

apps/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@nativescript/mlkit-text-recognition": "file:../../packages/mlkit-text-recognition"
1717
},
1818
"devDependencies": {
19-
"@nativescript/android": "~8.6.0",
20-
"@nativescript/ios": "~8.6.0"
19+
"@nativescript/android": "8.8.0-alpha.8",
20+
"@nativescript/ios": "~8.7.0"
2121
}
2222
}

apps/demo/project.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependsOn": [
1818
{
1919
"target": "build.all",
20-
"projects": "dependencies"
20+
"dependencies": true
2121
}
2222
]
2323
},
@@ -30,7 +30,7 @@
3030
"dependsOn": [
3131
{
3232
"target": "build.all",
33-
"projects": "dependencies"
33+
"dependencies": true
3434
}
3535
]
3636
},
@@ -43,7 +43,7 @@
4343
"dependsOn": [
4444
{
4545
"target": "build.all",
46-
"projects": "dependencies"
46+
"dependencies": true
4747
}
4848
]
4949
},
@@ -54,10 +54,7 @@
5454
}
5555
},
5656
"lint": {
57-
"executor": "@nrwl/linter:eslint",
58-
"options": {
59-
"lintFilePatterns": ["apps/demo/**/*.ts"]
60-
}
57+
"executor": "@nx/eslint:lint"
6158
}
6259
}
6360
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ export class DemoModel extends DemoSharedMlkitCore {
6969
try {
7070
const src = await ImageSource.fromUrl('https://www.jqueryscript.net/images/jQuery-Plugin-To-Generate-International-Article-Number-Barcode-EAN13.jpg');
7171

72-
console.log(src.android);
7372
const result = await detectWithStillImage(src, {
7473
detectorType: DetectionType.Barcode,
7574
});

apps/demo/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"@nativescript/mlkit-object-detection": ["../../packages/mlkit-object-detection/index.ts"],
1616
"@nativescript/mlkit-digital-ink-recognition": ["../../packages/mlkit-digital-ink-recognition/index.ts"],
1717
"@nativescript/mlkit-pose-detection": ["../../packages/mlkit-pose-detection/index.ts"],
18-
"@nativescript/mlkit-selfie-segmentation": ["../../packages/mlkit-selfie-segmentation/index.ts"]
18+
"@nativescript/mlkit-selfie-segmentation": ["../../packages/mlkit-selfie-segmentation/index.ts"],
19+
"@nativescript/*": ["../../packages/*"]
1920
}
2021
}
2122
}

0 commit comments

Comments
 (0)