Skip to content

Commit 1d66ddd

Browse files
authored
Merge pull request #63 from onderceylan/master
Updated iOS SDK and changed bash script's relative path in workspace
2 parents 8626f37 + f141c20 commit 1d66ddd

File tree

17 files changed

+42
-41
lines changed

17 files changed

+42
-41
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This is a [Cordova](http://cordova.apache.org/) plugin for [Fabric.io](https://w
44

55
It requires Cordova 3.x or newer (tested on 5.4.0) and has APIs for iOS and Android.
66

7-
The iOS version uses Fabric SDK 1.6.5 and Crashlytics SDK 3.6.0 framework bundles which are located in `lib/ios`.
7+
The iOS version uses Fabric SDK 1.6.9 and Crashlytics SDK 3.8.2 framework bundles which are located in `lib/ios`.
88

99
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.
1010

hooks/lib/ios-helper.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ module.exports = {
3131
// ../../plugins/plugin-id/lib/ios/Crashlytics.framework/run API_KEY SECRET_KEY
3232
var script = [
3333
"\"",
34-
"../../plugins/",
34+
utilities.getAppName(context),
35+
"/Plugins/",
3536
utilities.getPluginId(),
36-
"/lib/ios/Crashlytics.framework/run ",
37+
"/Fabric.framework/run ",
3738
pluginConfig.apiKey,
3839
" ",
3940
pluginConfig.apiSecret,

hooks/lib/utilities.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
var path = require("path");
77
var fs = require("fs");
88

9-
/**
10-
* Used to get the name of the application as defined in the config.xml.
11-
*
12-
* @param {object} context - The Cordova context.
13-
* @returns {string} The value of the name element in config.xml.
14-
*/
15-
function getAppName(context) {
16-
var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
17-
var config = new ConfigParser("config.xml");
18-
return config.name();
19-
};
20-
219
/**
2210
* Used to get the path to the build.gradle file for the Android project.
2311
*
@@ -29,6 +17,18 @@ function getBuildGradlePath() {
2917

3018
module.exports = {
3119

20+
/**
21+
* Used to get the name of the application as defined in the config.xml.
22+
*
23+
* @param {object} context - The Cordova context.
24+
* @returns {string} The value of the name element in config.xml.
25+
*/
26+
getAppName: function(context) {
27+
var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
28+
var config = new ConfigParser("config.xml");
29+
return config.name();
30+
},
31+
3232
/**
3333
* The ID of the plugin; this should match the ID in plugin.xml.
3434
*/
@@ -76,7 +76,7 @@ module.exports = {
7676
*/
7777
getXcodeProjectPath: function(context) {
7878

79-
var appName = getAppName(context);
79+
var appName = this.getAppName(context);
8080

8181
return path.join("platforms", "ios", appName + ".xcodeproj", "project.pbxproj");
8282
},
1.52 MB
Binary file not shown.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
2626
+ (instancetype)stackFrameWithSymbol:(NSString *)symbol;
2727

2828
@property (nonatomic, copy, nullable) NSString *symbol;
29+
@property (nonatomic, copy, nullable) NSString *rawSymbol;
2930
@property (nonatomic, copy, nullable) NSString *library;
3031
@property (nonatomic, copy, nullable) NSString *fileName;
3132
@property (nonatomic, assign) uint32_t lineNumber;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ NS_ASSUME_NONNULL_BEGIN
1818
@protocol CrashlyticsDelegate;
1919

2020
/**
21-
* Crashlytics. Handles configuration and initialization of Crashlytics.
21+
* Crashlytics. Handles configuration and initialization of Crashlytics.
22+
*
23+
* Note: The Crashlytics class cannot be subclassed. If this is causing you pain for
24+
* testing, we suggest using either a wrapper class or a protocol extension.
2225
*/
2326
@interface Crashlytics : NSObject
2427

-634 Bytes
Binary file not shown.
26 KB
Binary file not shown.
38 KB
Binary file not shown.

lib/ios/Fabric.framework/Fabric

1000 KB
Binary file not shown.

0 commit comments

Comments
 (0)