From d1f6679f2d68a9d12ab35628d4836afb24795f63 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Tue, 17 Jan 2017 19:32:41 -0600 Subject: [PATCH] [RN] Remove Crashlytics --- android/app/build.gradle | 17 ----------------- android/app/src/main/AndroidManifest.xml | 3 --- .../java/org/jitsi/meet/MainApplication.java | 5 +---- ios/Podfile | 12 ------------ ios/Podfile.lock | 16 ---------------- ios/app/AppDelegate.m | 4 ---- ios/app/Info.plist | 14 -------------- ios/jitsi-meet-react.xcodeproj/project.pbxproj | 14 -------------- .../contents.xcworkspacedata | 3 --- 9 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 ios/Podfile delete mode 100644 ios/Podfile.lock diff --git a/android/app/build.gradle b/android/app/build.gradle index 70fce4d85..02c1373e5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,15 +1,4 @@ -buildscript { - repositories { - maven { url 'https://maven.fabric.io/public' } - } - - dependencies { - classpath 'io.fabric.tools:gradle:1.+' - } -} - apply plugin: 'com.android.application' -apply plugin: 'io.fabric' import com.android.build.OutputFile @@ -149,9 +138,6 @@ if (project.hasProperty('JITSI_SIGNING') apply from: project.property('JITSI_SIGNING'); } -repositories { - maven { url 'https://maven.fabric.io/public' } -} dependencies { compile project(':react-native-keep-awake') compile project(':react-native-vector-icons') @@ -159,9 +145,6 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.0.1' compile 'com.facebook.react:react-native:+' - compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') { - transitive = true - } } apply from: '../../node_modules/react-native-vector-icons/fonts.gradle' diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a0e43d10d..9b40fcb94 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -43,8 +43,5 @@ - diff --git a/android/app/src/main/java/org/jitsi/meet/MainApplication.java b/android/app/src/main/java/org/jitsi/meet/MainApplication.java index f89391eb9..58ef834fa 100644 --- a/android/app/src/main/java/org/jitsi/meet/MainApplication.java +++ b/android/app/src/main/java/org/jitsi/meet/MainApplication.java @@ -2,13 +2,10 @@ package org.jitsi.meet; import android.app.Application; -import com.crashlytics.android.Crashlytics; import com.facebook.react.ReactApplication; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; -import io.fabric.sdk.android.Fabric; - import java.util.Arrays; import java.util.List; @@ -55,7 +52,7 @@ public class MainApplication extends Application implements ReactApplication { .getReactInstanceManager() .getDevSupportManager() .getDevSupportEnabled()) { - Fabric.with(this, new Crashlytics()); + // TODO Auto-generated method stub } } } diff --git a/ios/Podfile b/ios/Podfile deleted file mode 100644 index 29ee98f1e..000000000 --- a/ios/Podfile +++ /dev/null @@ -1,12 +0,0 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' - -target 'jitsi-meet-react' do - # Uncomment the next line if you're using Swift or would like to use dynamic frameworks - # use_frameworks! - - # Pods for jitsi-meet-react - pod 'Crashlytics' - pod 'Fabric' - -end diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index 6e3f58de3..000000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -PODS: - - Crashlytics (3.8.3): - - Fabric (~> 1.6.3) - - Fabric (1.6.11) - -DEPENDENCIES: - - Crashlytics - - Fabric - -SPEC CHECKSUMS: - Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e - Fabric: 5911403591946b8228ab1c51d98f1d7137e863c6 - -PODFILE CHECKSUM: 672d557f679f28c07b3364884b4580e605000f01 - -COCOAPODS: 1.1.1 diff --git a/ios/app/AppDelegate.m b/ios/app/AppDelegate.m index da7ed8ac6..d6f468dd4 100644 --- a/ios/app/AppDelegate.m +++ b/ios/app/AppDelegate.m @@ -8,8 +8,6 @@ */ #import "AppDelegate.h" -#import -#import #import "RCTAssert.h" #import "RCTBundleURLProvider.h" #import "RCTLinkingManager.h" @@ -55,8 +53,6 @@ continueUserActivity:(NSUserActivity *)userActivity didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { #if !DEBUG - [Fabric with:@[[Crashlytics class]]]; - // In the Release configuration, React Native will (intentionally) raise an // unhandled NSException for an unhandled JavaScript error. This will // effectively kill the application. In accord with the Web, do not kill the diff --git a/ios/app/Info.plist b/ios/app/Info.plist index da08718e0..06ef69201 100644 --- a/ios/app/Info.plist +++ b/ios/app/Info.plist @@ -22,20 +22,6 @@ ???? CFBundleVersion 1 - Fabric - - APIKey - a8ae24a58302ba79da1d312138e941f6b86e3242 - Kits - - - KitInfo - - KitName - Crashlytics - - - ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/jitsi-meet-react.xcodeproj/project.pbxproj b/ios/jitsi-meet-react.xcodeproj/project.pbxproj index f45467832..a8628ed5c 100644 --- a/ios/jitsi-meet-react.xcodeproj/project.pbxproj +++ b/ios/jitsi-meet-react.xcodeproj/project.pbxproj @@ -483,7 +483,6 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, B30EF2341DC0EEA500690F45 /* Embed Frameworks */, - B3DBBAC41DC6A3BE001DA4DD /* ShellScript */, B35383AD1DDA0083008F406A /* ShellScript */, ); buildRules = ( @@ -771,19 +770,6 @@ shellPath = /bin/sh; shellScript = "APP_PATH=\"${TARGET_BUILD_DIR}/${WRAPPER_NAME}\"\n\n# This script loops through the frameworks embedded in the application and\n# removes unused architectures.\nfind \"$APP_PATH\" -name '*.framework' -type d | while read -r FRAMEWORK\ndo\nFRAMEWORK_EXECUTABLE_NAME=$(defaults read \"$FRAMEWORK/Info.plist\" CFBundleExecutable)\nFRAMEWORK_EXECUTABLE_PATH=\"$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME\"\necho \"Executable is $FRAMEWORK_EXECUTABLE_PATH\"\n\nEXTRACTED_ARCHS=()\n\nfor ARCH in $ARCHS\ndo\necho \"Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME\"\nlipo -extract \"$ARCH\" \"$FRAMEWORK_EXECUTABLE_PATH\" -o \"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\"\nEXTRACTED_ARCHS+=(\"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\")\ndone\n\necho \"Merging extracted architectures: ${ARCHS}\"\nlipo -o \"$FRAMEWORK_EXECUTABLE_PATH-merged\" -create \"${EXTRACTED_ARCHS[@]}\"\nrm \"${EXTRACTED_ARCHS[@]}\"\n\necho \"Replacing original executable with thinned version\"\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\nmv \"$FRAMEWORK_EXECUTABLE_PATH-merged\" \"$FRAMEWORK_EXECUTABLE_PATH\"\n\ndone"; }; - B3DBBAC41DC6A3BE001DA4DD /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Fabric/run\" a8ae24a58302ba79da1d312138e941f6b86e3242 256ed316263eb534e26a1ad5dcc42ca9c179af5937dd864c3e44cfefa2e8b54c"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata b/ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata index c506067b0..870e30f28 100644 --- a/ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata +++ b/ios/jitsi-meet-react.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - -