diff --git a/.travis.yml b/.travis.yml index a397f3a7..48520890 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,10 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ +before_install: + - sudo pip install --upgrade pip + - sudo pip install six + install: - echo no | npm install -g nativescript - tns usage-reporting disable diff --git a/demo-ng/package.json b/demo-ng/package.json index 89157620..f002721d 100644 --- a/demo-ng/package.json +++ b/demo-ng/package.json @@ -25,7 +25,7 @@ "nativescript-angular": "^6.1.0", "nativescript-camera": "^4.0.2", "nativescript-imagepicker": "~6.0.4", - "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.4.tgz", + "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.5.tgz", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.10", "rxjs": "~6.0.0 || >=6.1.0", diff --git a/demo-push/package.json b/demo-push/package.json index e235c47f..03b935d5 100644 --- a/demo-push/package.json +++ b/demo-push/package.json @@ -9,7 +9,7 @@ } }, "dependencies": { - "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.4.tgz", + "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.5.tgz", "nativescript-theme-core": "^1.0.4", "nativescript-unit-test-runner": "^0.3.4", "tns-core-modules": "~4.2.0" diff --git a/demo/package.json b/demo/package.json index 0f700a94..1efbd139 100644 --- a/demo/package.json +++ b/demo/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "firebase-functions": "^2.0.5", - "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.4.tgz", + "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.5.tgz", "nativescript-theme-core": "^1.0.4", "nativescript-unit-test-runner": "^0.3.4", "tns-core-modules": "~5.0.5" diff --git a/src/firebase.ios.ts b/src/firebase.ios.ts index ba08ff1c..b080b88f 100755 --- a/src/firebase.ios.ts +++ b/src/firebase.ios.ts @@ -308,12 +308,9 @@ if (typeof (FIRMessaging) !== "undefined" || useExternalPushProvider) { function getAppDelegate() { // Play nice with other plugins by not completely ignoring anything already added to the appdelegate if (application.ios.delegate === undefined) { - class UIApplicationDelegateImpl extends UIResponder implements UIApplicationDelegate { - public static ObjCProtocols = [UIApplicationDelegate]; - // static new(): UIApplicationDelegateImpl { - // return super.new(); - // } + @ObjCClass(UIApplicationDelegate) + class UIApplicationDelegateImpl extends UIResponder implements UIApplicationDelegate { } application.ios.delegate = UIApplicationDelegateImpl; @@ -1223,7 +1220,7 @@ firebase.getValue = path => { return new Promise((resolve, reject) => { try { const where = path === undefined ? FIRDatabase.database().reference() : FIRDatabase.database().reference().childByAppendingPath(path); - const listener = where.observeSingleEventOfTypeWithBlockWithCancelBlock( + where.observeSingleEventOfTypeWithBlockWithCancelBlock( FIRDataEventType.Value, snapshot => { resolve(firebase.getCallbackData('ValueChanged', snapshot)); diff --git a/src/mlkit/mlkit-cameraview.ios.ts b/src/mlkit/mlkit-cameraview.ios.ts index 3f8697f5..af75a72c 100644 --- a/src/mlkit/mlkit-cameraview.ios.ts +++ b/src/mlkit/mlkit-cameraview.ios.ts @@ -171,9 +171,8 @@ export abstract class MLKitCameraView extends MLKitCameraViewBase { abstract createSuccessListener(): any; } +@ObjCClass(TNSMLKitCameraViewDelegate) class TNSMLKitCameraViewDelegateImpl extends NSObject implements TNSMLKitCameraViewDelegate { - public static ObjCProtocols = [TNSMLKitCameraViewDelegate]; - private owner: WeakRef; private resultCallback: (message: any) => void; private options?: any; diff --git a/src/package.json b/src/package.json index f1f6c7c4..7bd400bc 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-plugin-firebase", - "version": "7.4.4", + "version": "7.4.5", "description": "Fire. Base. Firebase!", "main": "firebase", "typings": "index.d.ts",