Merge pull request #63 from onderceylan/master

Updated iOS SDK and changed bash script's relative path in workspace

README.md

@@ -4,7 +4,7 @@ This is a [Cordova](http://cordova.apache.org/) plugin for [Fabric.io](https://w
 
 It requires Cordova 3.x or newer (tested on 5.4.0) and has APIs for iOS and Android.
 
-The iOS version uses Fabric SDK 1.6.5 and Crashlytics SDK 3.6.0 framework bundles which are located in `lib/ios`.
+The iOS version uses Fabric SDK 1.6.9 and Crashlytics SDK 3.8.2 framework bundles which are located in `lib/ios`.
 
 The Android version uses Gradle to get the Fabric SDK (`io.fabric.tools:gradle:1.+`) and the Crashlytics SDK (`com.crashlytics.sdk.android:crashlytics:2.5.5`) from Maven repositories when the plugin is added.
 

hooks/lib/ios-helper.js

@@ -31,9 +31,10 @@ module.exports = {
         // ../../plugins/plugin-id/lib/ios/Crashlytics.framework/run API_KEY SECRET_KEY
         var script = [
             "\"",
-            "../../plugins/",
+            utilities.getAppName(context),
+            "/Plugins/",
             utilities.getPluginId(),
-            "/lib/ios/Crashlytics.framework/run ",
+            "/Fabric.framework/run ",
             pluginConfig.apiKey,
             " ",
             pluginConfig.apiSecret,

hooks/lib/utilities.js

@@ -6,18 +6,6 @@
 var path = require("path");
 var fs = require("fs");
 
-/**
- * Used to get the name of the application as defined in the config.xml.
- *
- * @param {object} context - The Cordova context.
- * @returns {string} The value of the name element in config.xml.
- */
-function getAppName(context) {
-    var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
-    var config = new ConfigParser("config.xml");
-    return config.name();
-};
-
 /**
  * Used to get the path to the build.gradle file for the Android project.
  *
@@ -29,6 +17,18 @@ function getBuildGradlePath() {
 
 module.exports = {
 
+    /**
+     * Used to get the name of the application as defined in the config.xml.
+     * 
+     * @param {object} context - The Cordova context.
+     * @returns {string} The value of the name element in config.xml.
+     */
+    getAppName: function(context) {
+        var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
+        var config = new ConfigParser("config.xml");
+        return config.name();
+    },
+
     /**
      * The ID of the plugin; this should match the ID in plugin.xml.
      */
@@ -76,7 +76,7 @@ module.exports = {
      */
     getXcodeProjectPath: function(context) {
 
-        var appName = getAppName(context);
+        var appName = this.getAppName(context);
 
         return path.join("platforms", "ios", appName + ".xcodeproj", "project.pbxproj");
     },

lib/ios/Crashlytics.framework/Headers/CLSStackFrame.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)stackFrameWithSymbol:(NSString *)symbol;
 
 @property (nonatomic, copy, nullable) NSString *symbol;
+@property (nonatomic, copy, nullable) NSString *rawSymbol;
 @property (nonatomic, copy, nullable) NSString *library;
 @property (nonatomic, copy, nullable) NSString *fileName;
 @property (nonatomic, assign) uint32_t lineNumber;

lib/ios/Crashlytics.framework/Headers/Crashlytics.h

@@ -18,7 +18,10 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol CrashlyticsDelegate;
 
 /**
- *  Crashlytics. Handles configuration and initialization of Crashlytics.
+ * Crashlytics. Handles configuration and initialization of Crashlytics.
+ *
+ * Note: The Crashlytics class cannot be subclassed. If this is causing you pain for
+ * testing, we suggest using either a wrapper class or a protocol extension.
  */
 @interface Crashlytics : NSObject
 

lib/ios/Fabric.framework/Headers/FABAttributes.h

@@ -21,22 +21,11 @@
 
 #define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
 
-#if __has_feature(nullability)
-    #define fab_nullable           nullable
-    #define fab_nonnull            nonnull
-    #define fab_null_unspecified   null_unspecified
-    #define fab_null_resettable    null_resettable
-    #define __fab_nullable         __nullable
-    #define __fab_nonnull          __nonnull
-    #define __fab_null_unspecified __null_unspecified
-#else
-    #define fab_nullable
-    #define fab_nonnull
-    #define fab_null_unspecified
-    #define fab_null_resettable
-    #define __fab_nullable
-    #define __fab_nonnull
-    #define __fab_null_unspecified
+#if !__has_feature(nullability)
+    #define nonnull
+    #define nullable
+    #define _Nullable
+    #define _Nonnull
 #endif
 
 #ifndef NS_ASSUME_NONNULL_BEGIN
@@ -51,9 +40,11 @@
 /**
  * The following macros are defined here to provide
  * backwards compatability. If you are still using
- * them you should migrate to the new versions that
- * are defined above.
+ * them you should migrate to the native nullability
+ * macros.
  */
+#define fab_nullable      nullable
+#define fab_nonnull       nonnull
 #define FAB_NONNULL       __fab_nonnull
 #define FAB_NULLABLE      __fab_nullable
 #define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN

lib/ios/Fabric.framework/Headers/Fabric.h

@@ -71,6 +71,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
 
+/**
+ *  Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance.
+ */
++ (instancetype)new FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
+
 @end
 
 NS_ASSUME_NONNULL_END

lib/ios/README.txt

@@ -6,10 +6,10 @@ https://cocoapods.org/pods/Crashlytics
 
 Podspec references:
 
-https://github.com/CocoaPods/Specs/blob/master/Specs/Fabric/1.6.5/Fabric.podspec.json
-https://github.com/CocoaPods/Specs/blob/master/Specs/Crashlytics/3.6.0/Crashlytics.podspec.json
+https://github.com/CocoaPods/Specs/blob/master/Specs/Fabric/1.6.9/Fabric.podspec.json
+https://github.com/CocoaPods/Specs/blob/master/Specs/Crashlytics/3.8.2/Crashlytics.podspec.json
 
 Framework package ZIPs:
 
-https://kit-downloads.fabric.io/cocoapods/fabric/1.6.5/fabric.zip
-https://kit-downloads.fabric.io/cocoapods/crashlytics/3.6.0/crashlytics.zip
+https://kit-downloads.fabric.io/cocoapods/fabric/1.6.9/fabric.zip
+https://kit-downloads.fabric.io/cocoapods/crashlytics/3.8.2/crashlytics.zip

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-fabric-plugin",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Cordova Fabric.io Plugin",
   "cordova": {
     "id": "cordova-fabric-plugin",

plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<plugin id="cordova-fabric-plugin" version="1.0.8" xmlns="http://www.phonegap.com/ns/plugins/1.0">
+<plugin id="cordova-fabric-plugin" version="1.0.9" xmlns="http://www.phonegap.com/ns/plugins/1.0">
 
     <name>cordova-fabric-plugin</name>
     <description>Cordova Fabric.io Plugin</description>