cleanup

Author: EddyVerbruggen

demo/package.json

@@ -2,18 +2,18 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo",
     "tns-ios": {
-      "version": "5.0.0"
+      "version": "5.2.0"
     },
     "tns-android": {
-      "version": "5.0.0"
+      "version": "5.2.0"
     }
   },
   "dependencies": {
     "firebase-functions": "^2.0.5",
     "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-8.0.0.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "~5.0.5"
+    "tns-core-modules": "~5.2.0"
   },
   "devDependencies": {
     "@types/jasmine": "~2.8.0",
@@ -29,7 +29,7 @@
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "~0.7.1",
     "nativescript-dev-webpack": "^0.16.2",
-    "tns-platform-declarations": "~5.0.5",
+    "tns-platform-declarations": "~5.2.0",
     "tslint": "~5.4.3",
     "typescript": "~2.8.0"
   },

publish/scripts/installer.js

@@ -4,11 +4,13 @@ var prompt = require('prompt-lite');
 
 const { execSync } = require('child_process');
 const semver = require('semver');
-
-// iOS modern build system is supported from version NativeScript (CLI) version 5.2.0
 const tnsVersionFull = execSync('tns --version', { encoding: 'ascii'});
+
+// iOS modern build system is supported from version NativeScript-CLI version 5.2.0
 const supportsIOSModernBuildSystem = tnsVersionFull.indexOf("5.2.0-") > -1 || semver.gte(tnsVersionFull, "5.2.0");
-console.log({supportsIOSModernBuildSystem});
+
+// Custom gradle buildscripts are supported from NativeScript-Android version 5.3.0 (TODO this actually checks the CLI version)
+const supportsGradleBuildscripts = tnsVersionFull.indexOf("5.3.0-") > -1 || semver.gte(tnsVersionFull, "5.3.0");
 
 if (!supportsIOSModernBuildSystem) {
   console.log(`You're using NativeScript ${tnsVersionFull}.. which doesn't support the latest Firestore and in-app-messaging SDKs. Upgrade NativeScript to at least 5.2.0 if you need those!\n\n`);
@@ -699,12 +701,6 @@ function writeGradleFile(result) {
     fs.writeFileSync(directories.android + '/include.gradle',
         `
 android {
-    productFlavors {
-        "fireb" {
-            dimension "fireb"
-        }
-    }
-
     // (possibly-temporary) workaround for https://stackoverflow.com/questions/52518378/more-than-one-file-was-found-with-os-independent-path-meta-inf-proguard-android
     packagingOptions {
         exclude 'META-INF/proguard/androidx-annotations.pro'

src/firebase.ios.ts

@@ -43,14 +43,11 @@ firebase.areNotificationsEnabled = firebaseMessaging.areNotificationsEnabled;
 firebase.functions = firebaseFunctions;
 
 firebase.addAppDelegateMethods = appDelegate => {
-  console.log(">>> addAppDelegateMethods");
   // we need the launchOptions for this one so it's a bit hard to use the UIApplicationDidFinishLaunchingNotification pattern we're using for other things
   appDelegate.prototype.applicationDidFinishLaunchingWithOptions = (application, launchOptions) => {
-    console.log(">>> applicationDidFinishLaunchingWithOptions");
     if (!firebase._configured) {
       firebase._configured = true;
       if (typeof (FIRApp) !== "undefined") {
-        console.log(">>> applicationDidFinishLaunchingWithOptions, configure firebase");
         FIRApp.configure();
       }
     }
@@ -71,7 +68,6 @@ firebase.addAppDelegateMethods = appDelegate => {
 
   // there's no notification event to hook into for this one, so using the appDelegate
   if (typeof (FBSDKApplicationDelegate) !== "undefined" || typeof (GIDSignIn) !== "undefined" || typeof (FIRInvites) !== "undefined" || typeof (FIRDynamicLink) !== "undefined") {
-    console.log(">> wiring applicationOpenURLSourceApplicationAnnotation");
     appDelegate.prototype.applicationOpenURLSourceApplicationAnnotation = (application, url, sourceApplication, annotation) => {
       let result = false;
       if (typeof (FBSDKApplicationDelegate) !== "undefined") {
@@ -96,11 +92,8 @@ firebase.addAppDelegateMethods = appDelegate => {
       }
 
       if (typeof (FIRDynamicLink) !== "undefined") {
-        console.log(">> wiring applicationOpenURLSourceApplicationAnnotation, FIRDynamicLink");
         const dynamicLink = FIRDynamicLinks.dynamicLinks().dynamicLinkFromCustomSchemeURL(url);
-        console.log(">> wiring applicationOpenURLSourceApplicationAnnotation, FIRDynamicLink: " + dynamicLink);
         if (dynamicLink) {
-          console.log(">>> dynamicLink.url.absoluteString: " + dynamicLink.url.absoluteString);
           firebase._cachedDynamicLink = {
             url: dynamicLink.url.absoluteString,
             // matchConfidence: dynamicLink.matchConfidence,
@@ -116,7 +109,6 @@ firebase.addAppDelegateMethods = appDelegate => {
 
   if (typeof (FBSDKApplicationDelegate) !== "undefined" || typeof (GIDSignIn) !== "undefined" || typeof (FIRDynamicLink) !== "undefined") {
     appDelegate.prototype.applicationOpenURLOptions = (application, url, options) => {
-      console.log(">> wiring applicationOpenURLOptions");
 
       let result = false;
       if (typeof (FBSDKApplicationDelegate) !== "undefined") {
@@ -135,12 +127,9 @@ firebase.addAppDelegateMethods = appDelegate => {
       }
 
       if (typeof (FIRDynamicLink) !== "undefined") {
-        console.log(">> wiring applicationOpenURLOptions, FIRDynamicLink, url: " + url);
         const dynamicLinks: FIRDynamicLinks = FIRDynamicLinks.dynamicLinks();
         const dynamicLink: FIRDynamicLink = dynamicLinks.dynamicLinkFromCustomSchemeURL(url);
-        console.log(">> wiring applicationOpenURLOptions, FIRDynamicLink: " + dynamicLink);
         if (dynamicLink && dynamicLink.url !== null) {
-          console.log(">>> dynamicLink.url.absoluteString: " + dynamicLink.url.absoluteString);
           if (firebase._dynamicLinkCallback) {
             firebase._dynamicLinkCallback({
               url: dynamicLink.url.absoluteString,
@@ -162,9 +151,7 @@ firebase.addAppDelegateMethods = appDelegate => {
   }
 
   if (typeof (FIRDynamicLink) !== "undefined") {
-    console.log(">>> addAppDelegateMethods, FIRDynamicLink");
     appDelegate.prototype.applicationContinueUserActivityRestorationHandler = (application, userActivity, restorationHandler) => {
-      console.log(">>> applicationContinueUserActivityRestorationHandler");
       let result = false;
 
       if (userActivity.webpageURL) {
@@ -318,36 +305,13 @@ if (typeof (FIRMessaging) !== "undefined" || useExternalPushProvider) {
 // This breaks in-app-messaging :(
 function getAppDelegate() {
   // Play nice with other plugins by not completely ignoring anything already added to the appdelegate
-  console.log(">>> getAppDelegate, application.ios.delegate: " + application.ios.delegate);
   if (application.ios.delegate === undefined) {
-    console.log(">>> getAppDelegate, window =  " + application.ios.window);
 
+    @ObjCClass(UIApplicationDelegate)
     class UIApplicationDelegateImpl extends UIResponder implements UIApplicationDelegate {
-      public static ObjCProtocols = [UIApplicationDelegate];
-
-      // get window() {
-      //   console.log(">>> getting window: " + application.ios.window);
-      //   return application.ios.window;
-      // };
-
-      // set window(w) {
-      //   console.log(">>> setting window: " + w);
-      //   application.ios.window = w;
-      // };
-
-      // static new(): UIApplicationDelegateImpl {
-      //   console.log(">> new UIApplicationDelegateImpl");
-      //   return <UIApplicationDelegateImpl>super.new();
-      // }
     }
 
     application.ios.delegate = UIApplicationDelegateImpl;
-
-    setTimeout(() => {
-      if (!application.ios.delegate.window) {
-        application.ios.delegate.window = application.ios.window;
-      }
-    }, 2000);
   }
   return application.ios.delegate;
 }
@@ -386,18 +350,14 @@ firebase.init = arg => {
 
       // if deeplinks are used, then for this scheme to work the use must have added the bundle as a scheme to their plist (this is in our docs)
       if (FIROptions.defaultOptions() !== null) {
-        console.log(">> init, defaultOptions deepLinkURLScheme");
         FIROptions.defaultOptions().deepLinkURLScheme = NSBundle.mainBundle.bundleIdentifier;
-        console.log(">> init, defaultOptions deepLinkURLScheme: " + NSBundle.mainBundle.bundleIdentifier);
       }
 
       FIRAnalyticsConfiguration.sharedInstance().setAnalyticsCollectionEnabled(arg.analyticsCollectionEnabled !== false);
 
-      console.log(">>> init, configure firebase");
       if (!firebase._configured) {
         firebase._configured = true;
         if (typeof (FIRApp) !== "undefined") {
-          console.log(">>> init, firebase configured");
           FIRApp.configure();
         }
       }

src/scripts/postinstall.js

@@ -4176,11 +4176,13 @@ var prompt = __webpack_require__(/*! prompt-lite */ 1);
 
 const { execSync } = __webpack_require__(/*! child_process */ 3);
 const semver = __webpack_require__(/*! semver */ 2);
-
-// iOS modern build system is supported from version NativeScript (CLI) version 5.2.0
 const tnsVersionFull = execSync('tns --version', { encoding: 'ascii'});
+
+// iOS modern build system is supported from version NativeScript-CLI version 5.2.0
 const supportsIOSModernBuildSystem = tnsVersionFull.indexOf("5.2.0-") > -1 || semver.gte(tnsVersionFull, "5.2.0");
-console.log({supportsIOSModernBuildSystem});
+
+// Custom gradle buildscripts are supported from NativeScript-Android version 5.3.0 (TODO this actually checks the CLI version)
+const supportsGradleBuildscripts = tnsVersionFull.indexOf("5.3.0-") > -1 || semver.gte(tnsVersionFull, "5.3.0");
 
 if (!supportsIOSModernBuildSystem) {
   console.log(`You're using NativeScript ${tnsVersionFull}.. which doesn't support the latest Firestore and in-app-messaging SDKs. Upgrade NativeScript to at least 5.2.0 if you need those!\n\n`);
@@ -4871,12 +4873,6 @@ function writeGradleFile(result) {
     fs.writeFileSync(directories.android + '/include.gradle',
         `
 android {
-    productFlavors {
-        "fireb" {
-            dimension "fireb"
-        }
-    }
-
     // (possibly-temporary) workaround for https://stackoverflow.com/questions/52518378/more-than-one-file-was-found-with-os-independent-path-meta-inf-proguard-android
     packagingOptions {
         exclude 'META-INF/proguard/androidx-annotations.pro'