Merge pull request #1 from fabioalmeidaxpand/master

Fixes on Plugin to work with OutSystems Shell
OutSystems · Oct 26, 2016 · 3e48388 · 3e48388
2 parents 1d66ddd + 2df0b29
commit 3e48388
Show file tree

Hide file tree

Showing 32 changed files with 6 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/hooks/after_plugin_install.js b/hooks/after_plugin_install.js
diff --git a/hooks/before_plugin_uninstall.js b/hooks/before_plugin_uninstall.js
diff --git a/hooks/lib/android-helper.js b/hooks/lib/android-helper.js
diff --git a/hooks/lib/ios-helper.js b/hooks/lib/ios-helper.js
@@ -27,14 +27,18 @@ module.exports = {
         var xcodeProject = xcode.project(xcodeProjectPath);
         xcodeProject.parseSync();
 
+        xcodeProject.updateBuildProperty('ENABLE_BITCODE', 'NO');
+        xcodeProject.updateBuildProperty('ENABLE_TESTABILITY', 'NO');
+        xcodeProject.updateBuildProperty('DEBUG_INFORMATION_FORMAT', 'dwarf-with-dsym');
+
         // Build the body of the script to be executed during the build phase.
         // ../../plugins/plugin-id/lib/ios/Crashlytics.framework/run API_KEY SECRET_KEY
         var script = [
             "\"",
             utilities.getAppName(context),
             "/Plugins/",
             utilities.getPluginId(),
-            "/Fabric.framework/run ",
+            "/Crashlytics.framework/run ",
             pluginConfig.apiKey,
             " ",
             pluginConfig.apiSecret,

diff --git a/hooks/lib/utilities.js b/hooks/lib/utilities.js
diff --git a/lib/ios/Crashlytics.framework/Headers/ANSCompatibility.h b/lib/ios/Crashlytics.framework/Headers/ANSCompatibility.h
diff --git a/lib/ios/Crashlytics.framework/Headers/Answers.h b/lib/ios/Crashlytics.framework/Headers/Answers.h
diff --git a/lib/ios/Crashlytics.framework/Headers/CLSAttributes.h b/lib/ios/Crashlytics.framework/Headers/CLSAttributes.h
diff --git a/lib/ios/Crashlytics.framework/Headers/CLSLogging.h b/lib/ios/Crashlytics.framework/Headers/CLSLogging.h
diff --git a/lib/ios/Crashlytics.framework/Headers/CLSReport.h b/lib/ios/Crashlytics.framework/Headers/CLSReport.h
diff --git a/lib/ios/Crashlytics.framework/Headers/CLSStackFrame.h b/lib/ios/Crashlytics.framework/Headers/CLSStackFrame.h
diff --git a/lib/ios/Crashlytics.framework/Headers/Crashlytics.h b/lib/ios/Crashlytics.framework/Headers/Crashlytics.h
diff --git a/lib/ios/Crashlytics.framework/Info.plist b/lib/ios/Crashlytics.framework/Info.plist
diff --git a/lib/ios/Crashlytics.framework/Modules/module.modulemap b/lib/ios/Crashlytics.framework/Modules/module.modulemap
diff --git a/lib/ios/Fabric.framework/Headers/FABAttributes.h b/lib/ios/Fabric.framework/Headers/FABAttributes.h
diff --git a/lib/ios/Fabric.framework/Headers/Fabric.h b/lib/ios/Fabric.framework/Headers/Fabric.h
diff --git a/lib/ios/Fabric.framework/Info.plist b/lib/ios/Fabric.framework/Info.plist
diff --git a/lib/ios/Fabric.framework/Modules/module.modulemap b/lib/ios/Fabric.framework/Modules/module.modulemap
diff --git a/lib/ios/README.txt b/lib/ios/README.txt
diff --git a/package.json b/package.json
diff --git a/src/android/FabricPlugin.java b/src/android/FabricPlugin.java
@@ -219,7 +219,7 @@ public void run() {
 				evt.putItemId(data.optString(5));
 
 				if (!data.isNull(6)) {
-					populateCustomAttributes(evt, data.optJSONObject(5));
+					populateCustomAttributes(evt, data.optJSONObject(6));
 				}
 
 				Answers.getInstance().logPurchase(evt);

diff --git a/src/android/build-extras.gradle b/src/android/build-extras.gradle
diff --git a/tests/runtime-tests.js b/tests/runtime-tests.js
diff --git a/typings/cordova-fabric-plugin-tests.ts b/typings/cordova-fabric-plugin-tests.ts
diff --git a/typings/cordova-fabric-plugin.d.ts b/typings/cordova-fabric-plugin.d.ts
diff --git a/www/FabricPlugin.Answers.es6 b/www/FabricPlugin.Answers.es6
diff --git a/www/FabricPlugin.Answers.js b/www/FabricPlugin.Answers.js
diff --git a/www/FabricPlugin.Crashlytics.es6 b/www/FabricPlugin.Crashlytics.es6
diff --git a/www/FabricPlugin.Crashlytics.js b/www/FabricPlugin.Crashlytics.js
diff --git a/www/FabricPlugin.es6 b/www/FabricPlugin.es6
diff --git a/www/FabricPlugin.js b/www/FabricPlugin.js