Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/v3, updates GoogleMLKit to resolve linker issues and upgrades to latest plugin-tools #67

Open
wants to merge 3 commits into
base: feat/v3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["references.d.ts"],
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ Thumbs.db
*.tgz
packages/**/angular/dist

.nx/cache
.nx/cache
.nx/workspace-data
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
/coverage
native-src

/.nx/cache
/.nx/cache
/.nx/workspace-data
4 changes: 2 additions & 2 deletions apps/demo-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@nativescript/mlkit-selfie-segmentation": "file:../../dist/packages/mlkit-selfie-segmentation"
},
"devDependencies": {
"@nativescript/android": "8.8.0-alpha.7",
"@nativescript/ios": "~8.7.0"
"@nativescript/android": "~8.8.0",
"@nativescript/ios": "~8.8.0"
}
}
4 changes: 2 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@nativescript/mlkit-text-recognition": "file:../../packages/mlkit-text-recognition"
},
"devDependencies": {
"@nativescript/android": "8.8.0-alpha.8",
"@nativescript/ios": "~8.7.0"
"@nativescript/android": "~8.8.0",
"@nativescript/ios": "~8.8.0"
}
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@
},
"private": true,
"devDependencies": {
"@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",
"@angular/animations": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/router": "^18.0.0",
"@nativescript/angular": "^18.0.0",
"@nativescript/core": "~8.8.0",
"@nativescript/plugin-tools": "5.4.1",
"@nativescript/types": "~8.8.0",
"@nativescript/webpack": "~5.0.5",
"@ngtools/webpack": "^17.0.0",
"@ngtools/webpack": "^18.0.0",
"husky": "~9.0.0",
"nativescript-vue": "~2.9.0",
"nativescript-vue-template-compiler": "~2.9.0",
"ng-packagr": "^17.0.0",
"ng-packagr": "^18.0.0",
"rxjs": "~7.8.0",
"typescript": "~5.4.0",
"typescript": "~5.5.0",
"zone.js": "~0.14.0",
"@angular-devkit/build-angular": "^17.0.0"
"@angular-devkit/build-angular": "^18.0.0"
},
"lint-staged": {
"**/*.{js,ts,scss,json,html}": [
Expand Down
4 changes: 2 additions & 2 deletions packages/mlkit-barcode-scanning/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
platform :ios, '11.0'
pod 'GoogleMLKit/BarcodeScanning', '5.0.0'
platform :ios, '15.5'
pod 'GoogleMLKit/BarcodeScanning', '7.0.0'
4 changes: 4 additions & 0 deletions packages/mlkit-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"description": "NativeScript MLKit Core",
"main": "index",
"typings": "index.d.ts",
"files": [
"*",
"angular/package.json"
],
"nativescript": {
"platforms": {
"ios": "6.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/mlkit-digital-ink-recognition/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
platform :ios, '11.0'
pod 'GoogleMLKit/DigitalInkRecognition', '5.0.0'
platform :ios, '15.5'
pod 'GoogleMLKit/DigitalInkRecognition', '7.0.0'
4 changes: 2 additions & 2 deletions packages/mlkit-face-detection/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
platform :ios, '11.0'
pod 'GoogleMLKit/FaceDetection', '5.0.0'
platform :ios, '15.5'
pod 'GoogleMLKit/FaceDetection', '7.0.0'
4 changes: 2 additions & 2 deletions packages/mlkit-image-labeling/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
platform :ios, '11.0'
pod 'GoogleMLKit/ImageLabeling', '5.0.0'
platform :ios, '15.5'
pod 'GoogleMLKit/ImageLabeling', '7.0.0'
4 changes: 2 additions & 2 deletions packages/mlkit-object-detection/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
platform :ios, '11.0'
pod 'GoogleMLKit/ObjectDetection', '5.0.0'
platform :ios, '15.5'
pod 'GoogleMLKit/ObjectDetection', '7.0.0'
6 changes: 3 additions & 3 deletions packages/mlkit-pose-detection/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
platform :ios, '11.0'
platform :ios, '15.5'

if defined?($NSMLKitPoseDetectionAccurate)
pod 'GoogleMLKit/PoseDetectionAccurate', '5.0.0'
pod 'GoogleMLKit/PoseDetectionAccurate', '7.0.0'
else
pod 'GoogleMLKit/PoseDetection', '5.0.0'
pod 'GoogleMLKit/PoseDetection', '7.0.0'
end
2 changes: 1 addition & 1 deletion packages/mlkit-selfie-segmentation/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pod 'GoogleMLKit/SegmentationSelfie', '5.0.0'
pod 'GoogleMLKit/SegmentationSelfie', '7.0.0'
4 changes: 2 additions & 2 deletions packages/mlkit-text-recognition/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
platform :ios, '11.0'
pod 'GoogleMLKit/TextRecognition','5.0.0'
platform :ios, '15.5'
pod 'GoogleMLKit/TextRecognition','7.0.0'
4 changes: 2 additions & 2 deletions tools/assets/App_Resources/iOS/Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

platform :ios, '13.0'
platform :ios, '15.5'

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.5'
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
end
end
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
],
"paths": {
"@demo/shared": ["tools/demo/index.ts"],
"@nativescript/*": ["packages/*"],
"@nativescript/mlkit-barcode-scanning": ["packages/mlkit-barcode-scanning/index.ts"],
"@nativescript/mlkit-core": ["packages/mlkit-core/index.d.ts"],
"@nativescript/mlkit-core/angular": ["packages/mlkit-core/angular/index.ts"],
Expand All @@ -30,8 +31,7 @@
"@nativescript/mlkit-object-detection": ["packages/mlkit-object-detection/index.ts"],
"@nativescript/mlkit-pose-detection": ["packages/mlkit-pose-detection/index.ts"],
"@nativescript/mlkit-selfie-segmentation": ["packages/mlkit-selfie-segmentation/index.ts"],
"@nativescript/mlkit-text-recognition": ["packages/mlkit-text-recognition/index.ts"],
"@nativescript/*": ["packages/*"]
"@nativescript/mlkit-text-recognition": ["packages/mlkit-text-recognition/index.ts"]
}
},
"exclude": ["node_modules", "tmp"]
Expand Down