From 04e9c0b13b3d2f1c67ac75103bdcbacda2848577 Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Fri, 12 Jul 2019 10:37:05 +0100 Subject: [PATCH] rename plugins as requested --- .buildkite/pipeline.yml | 6 ++--- .gitmodules | 4 +-- Makefile | 2 +- TESTING.md | 2 +- bugsnag-android-anr/gradle.properties | 2 -- bugsnag-android-core/gradle.properties | 2 -- bugsnag-android-ndk/README.md | 8 +----- bugsnag-android-ndk/build.gradle | 25 +------------------ .../src/main/AndroidManifest.xml | 2 +- bugsnag-android/README.md | 6 ++--- bugsnag-android/build.gradle | 6 ++--- .../CMakeLists.txt | 0 .../README.md | 2 +- .../build.gradle | 2 +- bugsnag-plugin-android-anr/gradle.properties | 2 ++ .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/CMakeLists.txt | 6 ++--- .../java/com/bugsnag/android/AnrPlugin.kt | 2 +- .../android/AppNotRespondingMonitor.java | 0 .../src/main/jni/anr_handler.c | 0 .../src/main/jni/anr_handler.h | 0 .../src/main/jni/bugsnag_anr.c | 0 .../src/main/jni/bugsnag_anr.h | 2 +- .../src/main/jni/utils/string.c | 0 .../src/main/jni/utils/string.h | 0 .../README.md | 2 +- .../build.gradle | 0 bugsnag-plugin-android-jvm/gradle.properties | 2 ++ .../proguard-rules.pro | 0 .../src/androidTest/AndroidManifest.xml | 0 .../java/com/bugsnag/android/AnrConfigTest.kt | 0 .../bugsnag/android/AppDataOverrideTest.kt | 0 .../bugsnag/android/AppDataSummaryTest.java | 0 .../java/com/bugsnag/android/AppDataTest.java | 0 .../com/bugsnag/android/BeforeNotifyTest.kt | 0 .../android/BeforeRecordBreadcrumbsTest.java | 0 .../com/bugsnag/android/BeforeSendTest.java | 0 .../com/bugsnag/android/BreadcrumbsTest.kt | 0 .../android/BugsnagPluginInterfaceTest.kt | 0 .../com/bugsnag/android/BugsnagTestUtils.java | 0 .../com/bugsnag/android/CachedThreadTest.java | 0 .../com/bugsnag/android/ClientConfigTest.java | 0 .../com/bugsnag/android/ClientNotifyTest.java | 0 .../java/com/bugsnag/android/ClientTest.java | 0 .../android/ConcurrentCallbackTest.java | 0 .../bugsnag/android/ConfigurationTest.java | 0 .../com/bugsnag/android/CustomException.java | 0 .../bugsnag/android/DeliveryCompatTest.java | 0 .../android/DeviceDataSummaryTest.java | 0 .../com/bugsnag/android/DeviceDataTest.java | 0 .../com/bugsnag/android/ErrorFilenameTest.kt | 0 .../com/bugsnag/android/ErrorReaderTest.java | 0 .../android/ErrorReportApiClientTest.java | 0 .../java/com/bugsnag/android/ErrorTest.java | 0 .../bugsnag/android/EventReceiverTest.java | 0 .../bugsnag/android/ExceptionHandlerTest.java | 0 .../com/bugsnag/android/ExceptionsTest.java | 0 .../java/com/bugsnag/android/FileUtils.java | 0 .../com/bugsnag/android/HandledStateTest.java | 0 .../com/bugsnag/android/JsonStreamTest.java | 0 .../android/JsonWriterBugsnagTest.java | 0 .../com/bugsnag/android/JsonWriterTest.java | 0 .../bugsnag/android/MetaDataMergeTest.java | 0 .../com/bugsnag/android/MetaDataTest.java | 0 .../bugsnag/android/NativeInterfaceTest.java | 0 .../com/bugsnag/android/NotifierTest.java | 0 .../com/bugsnag/android/NullMetadataTest.java | 0 .../android/ObserverInterfaceTest.java | 0 .../bugsnag/android/ProjectPackagesTest.kt | 0 .../java/com/bugsnag/android/ReportTest.java | 0 .../java/com/bugsnag/android/RxErrorTest.kt | 0 .../com/bugsnag/android/SessionStoreTest.java | 0 .../java/com/bugsnag/android/SessionTest.kt | 0 .../android/SessionTrackerStopResumeTest.kt | 0 .../bugsnag/android/SessionTrackerTest.java | 0 .../android/SessionTrackingPayloadTest.java | 0 .../com/bugsnag/android/StacktraceTest.java | 0 .../com/bugsnag/android/StrictModeTest.java | 0 .../bugsnag/android/StrictModeWrapper.java | 0 .../com/bugsnag/android/TestRunListener.kt | 0 .../com/bugsnag/android/ThreadStateTest.kt | 0 .../android/UniqueBeforeNotifyTest.java | 0 .../java/com/bugsnag/android/UserTest.java | 0 .../src/androidTest/resources/error.json | 0 .../src/androidTest/resources/rx_error.json | 0 .../src/main/AndroidManifest.xml | 0 .../java/com/bugsnag/android/AppData.java | 0 .../main/java/com/bugsnag/android/Async.java | 0 .../bugsnag/android/BadResponseException.java | 0 .../com/bugsnag/android/BeforeNotify.java | 0 .../android/BeforeRecordBreadcrumb.java | 0 .../java/com/bugsnag/android/BeforeSend.java | 0 .../bugsnag/android/BeforeSendSession.java | 0 .../java/com/bugsnag/android/Breadcrumb.java | 0 .../com/bugsnag/android/BreadcrumbType.java | 0 .../java/com/bugsnag/android/Breadcrumbs.java | 0 .../java/com/bugsnag/android/Bugsnag.java | 0 .../com/bugsnag/android/BugsnagException.java | 0 .../bugsnag/android/BugsnagPluginInterface.kt | 0 .../com/bugsnag/android/CachedThread.java | 0 .../java/com/bugsnag/android/Callback.java | 0 .../main/java/com/bugsnag/android/Client.java | 4 +-- .../com/bugsnag/android/ConfigFactory.java | 0 .../com/bugsnag/android/Configuration.java | 0 .../com/bugsnag/android/ConnectivityCompat.kt | 0 .../java/com/bugsnag/android/DateUtils.java | 0 .../com/bugsnag/android/DefaultDelivery.java | 0 .../java/com/bugsnag/android/Delivery.java | 0 .../com/bugsnag/android/DeliveryCompat.java | 0 .../android/DeliveryFailureException.java | 0 .../com/bugsnag/android/DeliveryStyle.java | 0 .../java/com/bugsnag/android/DeviceData.java | 0 .../main/java/com/bugsnag/android/Error.java | 0 .../java/com/bugsnag/android/ErrorReader.java | 0 .../bugsnag/android/ErrorReportApiClient.java | 0 .../java/com/bugsnag/android/ErrorStore.java | 0 .../com/bugsnag/android/EventReceiver.java | 0 .../com/bugsnag/android/ExceptionHandler.java | 0 .../java/com/bugsnag/android/Exceptions.java | 0 .../java/com/bugsnag/android/FileStore.java | 0 .../bugsnag/android/ForegroundDetector.java | 0 .../com/bugsnag/android/HandledState.java | 0 .../java/com/bugsnag/android/IOUtils.java | 0 .../java/com/bugsnag/android/InternalApi.java | 0 .../java/com/bugsnag/android/JsonScope.java | 0 .../java/com/bugsnag/android/JsonStream.java | 0 .../java/com/bugsnag/android/JsonWriter.java | 0 .../main/java/com/bugsnag/android/Logger.java | 0 .../java/com/bugsnag/android/MapUtils.java | 0 .../java/com/bugsnag/android/MetaData.java | 0 .../com/bugsnag/android/NativeInterface.java | 0 .../com/bugsnag/android/NetworkException.java | 0 .../java/com/bugsnag/android/Notifier.java | 0 .../java/com/bugsnag/android/NotifyType.java | 0 .../bugsnag/android/ObjectJsonStreamer.java | 0 .../main/java/com/bugsnag/android/Report.java | 0 .../java/com/bugsnag/android/Session.java | 0 .../com/bugsnag/android/SessionStore.java | 0 .../com/bugsnag/android/SessionTracker.java | 0 .../android/SessionTrackingApiClient.java | 0 .../android/SessionTrackingPayload.java | 0 .../java/com/bugsnag/android/Severity.java | 0 .../java/com/bugsnag/android/Stacktrace.java | 0 .../bugsnag/android/StrictModeHandler.java | 0 .../java/com/bugsnag/android/ThreadSafe.java | 0 .../java/com/bugsnag/android/ThreadState.java | 0 .../main/java/com/bugsnag/android/User.java | 0 .../CMakeLists.txt | 0 bugsnag-plugin-android-ndk/README.md | 9 +++++++ bugsnag-plugin-android-ndk/build.gradle | 24 ++++++++++++++++++ bugsnag-plugin-android-ndk/gradle.properties | 2 ++ .../package.json | 0 .../proguard-rules.pro | 0 .../bugsnag/android/ndk/NativeCXXTest.java | 0 .../src/main/AndroidManifest.xml | 2 ++ .../src/main/CMakeLists.txt | 0 .../src/main/assets/include/bugsnag.h | 0 .../src/main/assets/include/report.h | 0 .../java/com/bugsnag/android/NdkPlugin.kt | 0 .../com/bugsnag/android/ndk/NativeBridge.java | 0 .../src/main/jni/bugsnag.c | 0 .../src/main/jni/bugsnag_ndk.c | 0 .../src/main/jni/bugsnag_ndk.h | 0 .../src/main/jni/deps/parson/package.json | 0 .../src/main/jni/deps/parson/parson.c | 0 .../src/main/jni/deps/parson/parson.h | 0 .../libunwind/include/__libunwind_config.h | 0 .../external/libunwind/include/libunwind.h | 0 .../src/main/jni/external/libunwindstack-ndk | 0 .../src/main/jni/handlers/cpp_handler.cpp | 0 .../src/main/jni/handlers/cpp_handler.h | 0 .../src/main/jni/handlers/signal_handler.c | 0 .../src/main/jni/handlers/signal_handler.h | 0 .../src/main/jni/metadata.c | 0 .../src/main/jni/metadata.h | 0 .../src/main/jni/report.c | 0 .../src/main/jni/report.h | 0 .../src/main/jni/utils/build.h | 0 .../src/main/jni/utils/crash_info.c | 0 .../src/main/jni/utils/crash_info.h | 0 .../src/main/jni/utils/migrate.h | 0 .../src/main/jni/utils/serializer.c | 0 .../src/main/jni/utils/serializer.h | 0 .../src/main/jni/utils/stack_unwinder.c | 0 .../src/main/jni/utils/stack_unwinder.h | 0 .../jni/utils/stack_unwinder_libcorkscrew.c | 0 .../jni/utils/stack_unwinder_libcorkscrew.h | 0 .../main/jni/utils/stack_unwinder_libunwind.c | 0 .../main/jni/utils/stack_unwinder_libunwind.h | 0 .../utils/stack_unwinder_libunwindstack.cpp | 0 .../jni/utils/stack_unwinder_libunwindstack.h | 0 .../main/jni/utils/stack_unwinder_simple.c | 0 .../main/jni/utils/stack_unwinder_simple.h | 0 .../src/main/jni/utils/string.c | 0 .../src/main/jni/utils/string.h | 0 .../src/test/CMakeLists.txt | 0 .../src/test/cpp/deps/greatest/greatest.h | 0 .../src/test/cpp/deps/greatest/package.json | 0 .../src/test/cpp/main.c | 0 .../src/test/cpp/test_breadcrumbs.c | 0 .../src/test/cpp/test_utils_serialize.c | 0 .../src/test/cpp/test_utils_string.c | 0 dockerfiles/Dockerfile.android-base | 5 ++-- dockerfiles/Dockerfile.android-builder | 5 ++-- .../Dockerfile.android-instrumentation-tests | 7 +++--- dockerfiles/Dockerfile.android-linter | 15 +++++------ .../sdk-app-example/ndk_local_setup.gradle | 2 +- .../example/ExampleActivity.kt | 9 +++---- .../example/ExampleApplication.kt | 1 + settings.gradle | 10 ++++++-- 211 files changed, 99 insertions(+), 81 deletions(-) delete mode 100644 bugsnag-android-anr/gradle.properties delete mode 100644 bugsnag-android-core/gradle.properties rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/CMakeLists.txt (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/README.md (91%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/build.gradle (94%) create mode 100644 bugsnag-plugin-android-anr/gradle.properties rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/proguard-rules.pro (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/AndroidManifest.xml (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/CMakeLists.txt (86%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/java/com/bugsnag/android/AnrPlugin.kt (93%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/java/com/bugsnag/android/AppNotRespondingMonitor.java (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/jni/anr_handler.c (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/jni/anr_handler.h (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/jni/bugsnag_anr.c (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/jni/bugsnag_anr.h (84%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/jni/utils/string.c (100%) rename {bugsnag-android-anr => bugsnag-plugin-android-anr}/src/main/jni/utils/string.h (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/README.md (92%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/build.gradle (100%) create mode 100644 bugsnag-plugin-android-jvm/gradle.properties rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/proguard-rules.pro (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/AndroidManifest.xml (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/AnrConfigTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/AppDataOverrideTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/AppDataSummaryTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/AppDataTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/BeforeRecordBreadcrumbsTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/BeforeSendTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/BugsnagPluginInterfaceTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/CachedThreadTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ClientConfigTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ClientNotifyTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ClientTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/CustomException.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/DeviceDataSummaryTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ErrorFilenameTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ErrorReaderTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ErrorReportApiClientTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ErrorTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/EventReceiverTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ExceptionHandlerTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/FileUtils.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/HandledStateTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/JsonWriterBugsnagTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/JsonWriterTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/MetaDataMergeTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/MetaDataTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/NativeInterfaceTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/NotifierTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ProjectPackagesTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ReportTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/RxErrorTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/SessionTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/SessionTrackerStopResumeTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/StacktraceTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/StrictModeTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/StrictModeWrapper.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/TestRunListener.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/ThreadStateTest.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/UniqueBeforeNotifyTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/java/com/bugsnag/android/UserTest.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/resources/error.json (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/androidTest/resources/rx_error.json (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/AndroidManifest.xml (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/AppData.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Async.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BadResponseException.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BeforeNotify.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BeforeRecordBreadcrumb.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BeforeSend.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BeforeSendSession.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Breadcrumb.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BreadcrumbType.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Breadcrumbs.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Bugsnag.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BugsnagException.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/BugsnagPluginInterface.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/CachedThread.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Callback.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Client.java (99%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ConfigFactory.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Configuration.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ConnectivityCompat.kt (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/DateUtils.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/DefaultDelivery.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Delivery.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/DeliveryCompat.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/DeliveryFailureException.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/DeliveryStyle.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/DeviceData.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Error.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ErrorReader.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ErrorReportApiClient.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ErrorStore.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/EventReceiver.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ExceptionHandler.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Exceptions.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/FileStore.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ForegroundDetector.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/HandledState.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/IOUtils.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/InternalApi.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/JsonScope.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/JsonStream.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/JsonWriter.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Logger.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/MapUtils.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/MetaData.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/NativeInterface.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/NetworkException.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Notifier.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/NotifyType.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ObjectJsonStreamer.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Report.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Session.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/SessionStore.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/SessionTracker.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/SessionTrackingPayload.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Severity.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/Stacktrace.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/StrictModeHandler.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ThreadSafe.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/ThreadState.java (100%) rename {bugsnag-android-core => bugsnag-plugin-android-jvm}/src/main/java/com/bugsnag/android/User.java (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/CMakeLists.txt (100%) create mode 100644 bugsnag-plugin-android-ndk/README.md create mode 100644 bugsnag-plugin-android-ndk/build.gradle create mode 100644 bugsnag-plugin-android-ndk/gradle.properties rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/package.json (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/proguard-rules.pro (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/androidTest/java/com/bugsnag/android/ndk/NativeCXXTest.java (100%) create mode 100644 bugsnag-plugin-android-ndk/src/main/AndroidManifest.xml rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/CMakeLists.txt (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/assets/include/bugsnag.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/assets/include/report.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/java/com/bugsnag/android/NdkPlugin.kt (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/java/com/bugsnag/android/ndk/NativeBridge.java (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/bugsnag.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/bugsnag_ndk.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/bugsnag_ndk.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/deps/parson/package.json (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/deps/parson/parson.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/deps/parson/parson.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/external/libunwind/include/__libunwind_config.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/external/libunwind/include/libunwind.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/external/libunwindstack-ndk (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/handlers/cpp_handler.cpp (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/handlers/cpp_handler.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/handlers/signal_handler.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/handlers/signal_handler.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/metadata.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/metadata.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/report.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/report.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/build.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/crash_info.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/crash_info.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/migrate.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/serializer.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/serializer.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_libcorkscrew.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_libcorkscrew.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_libunwind.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_libunwind.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_libunwindstack.cpp (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_libunwindstack.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_simple.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/stack_unwinder_simple.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/string.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/main/jni/utils/string.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/CMakeLists.txt (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/cpp/deps/greatest/greatest.h (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/cpp/deps/greatest/package.json (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/cpp/main.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/cpp/test_breadcrumbs.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/cpp/test_utils_serialize.c (100%) rename {bugsnag-android-ndk => bugsnag-plugin-android-ndk}/src/test/cpp/test_utils_string.c (100%) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 923058d93b..fcf58c4ac0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -141,7 +141,7 @@ steps: - docker-compose#v2.6.0: run: android-instrumentation-tests env: - APP_LOCATION: "/app/bugsnag-android-core/build/outputs/apk/androidTest/debug/bugsnag-android-debug-androidTest.apk" + APP_LOCATION: "/app/bugsnag-plugin-android-jvm/build/outputs/apk/androidTest/debug/bugsnag-plugin-android-jvm-debug-androidTest.apk" INSTRUMENTATION_DEVICES: '["Google Nexus 5-4.4", "Google Pixel-7.1", "Google Pixel 3-9.0"]' NDK_VERSION: "r12b" concurrency: 5 @@ -152,7 +152,7 @@ steps: - docker-compose#v2.6.0: run: android-instrumentation-tests env: - APP_LOCATION: "/app/bugsnag-android-core/build/outputs/apk/androidTest/debug/bugsnag-android-debug-androidTest.apk" + APP_LOCATION: "/app/bugsnag-plugin-android-jvm/build/outputs/apk/androidTest/debug/bugsnag-plugin-android-jvm-debug-androidTest.apk" INSTRUMENTATION_DEVICES: '["Google Nexus 5-4.4", "Google Pixel-7.1", "Google Pixel 3-9.0"]' NDK_VERSION: "r16b" concurrency: 5 @@ -163,7 +163,7 @@ steps: - docker-compose#v2.6.0: run: android-instrumentation-tests env: - APP_LOCATION: "/app/bugsnag-android-core/build/outputs/apk/androidTest/debug/bugsnag-android-debug-androidTest.apk" + APP_LOCATION: "/app/bugsnag-plugin-android-jvm/build/outputs/apk/androidTest/debug/bugsnag-plugin-android-jvm-debug-androidTest.apk" INSTRUMENTATION_DEVICES: '["Google Nexus 5-4.4", "Google Pixel-7.1", "Google Pixel 3-9.0"]' NDK_VERSION: "r19" concurrency: 5 diff --git a/.gitmodules b/.gitmodules index 1e09e98ec9..a0972c06ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "bugsnag-android-ndk/src/main/jni/external/libunwindstack-ndk"] - path = bugsnag-android-ndk/src/main/jni/external/libunwindstack-ndk +[submodule "bugsnag-plugin-android-ndk/src/main/jni/external/libunwindstack-ndk"] + path = bugsnag-plugin-android-ndk/src/main/jni/external/libunwindstack-ndk url = https://github.com/bugsnag/libunwindstack-ndk diff --git a/Makefile b/Makefile index 27b4bf5753..fba9bf02ad 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ endif ifeq ($(BROWSER_STACK_ACCESS_KEY),) @$(error BROWSER_STACK_ACCESS_KEY is not defined) endif - @APP_LOCATION=/app/bugsnag-android-core/build/outputs/apk/androidTest/debug/bugsnag-android-debug-androidTest.apk \ + @APP_LOCATION=/app/bugsnag-plugin-android-jvm/build/outputs/apk/androidTest/debug/bugsnag-plugin-android-jvm-debug-androidTest.apk \ INSTRUMENTATION_DEVICES='["Google Nexus 5-4.4", "Google Pixel-7.1", "Google Pixel 3-9.0"]' \ docker-compose up --build android-instrumentation-tests diff --git a/TESTING.md b/TESTING.md index d643afcdf9..6bd596000c 100644 --- a/TESTING.md +++ b/TESTING.md @@ -4,7 +4,7 @@ Commands can be run on the entire project, or on an individual module: ```shell ./gradlew build // builds whole project -./gradlew bugsnag-android-anr:build // builds bugsnag-android-anr module only +./gradlew bugsnag-plugin-android-anr:build // builds bugsnag-plugin-android-anr module only ``` ## Static analysis diff --git a/bugsnag-android-anr/gradle.properties b/bugsnag-android-anr/gradle.properties deleted file mode 100644 index 95b8920988..0000000000 --- a/bugsnag-android-anr/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -pomName=Bugsnag Android ANR -artefactId=bugsnag-android-anr diff --git a/bugsnag-android-core/gradle.properties b/bugsnag-android-core/gradle.properties deleted file mode 100644 index 99e420b0a5..0000000000 --- a/bugsnag-android-core/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -pomName=Bugsnag Android Core -artefactId=bugsnag-android-core diff --git a/bugsnag-android-ndk/README.md b/bugsnag-android-ndk/README.md index e1f8f7c013..9ff81719ec 100644 --- a/bugsnag-android-ndk/README.md +++ b/bugsnag-android-ndk/README.md @@ -1,9 +1,3 @@ # bugsnag-android-ndk -This module detects NDK signals/exceptions and reports them to bugsnag. - -## High-level Overview - -This module installs C signal handlers and a CPP exception handler. When a native crash occurs, -it writes a report to disk. This is then converted to a JVM report on the next app launch, and is -delivered to the error reporting API. +This module is identical to [bugsnag-android](../bugsnag-android/README.md) and is published for legacy support. diff --git a/bugsnag-android-ndk/build.gradle b/bugsnag-android-ndk/build.gradle index 00f63c2171..a192213eff 100644 --- a/bugsnag-android-ndk/build.gradle +++ b/bugsnag-android-ndk/build.gradle @@ -1,24 +1 @@ -apply plugin: "com.android.library" -apply plugin: "kotlin-android" -apply plugin: "io.gitlab.arturbosch.detekt" - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - externalNativeBuild.cmake.arguments "-DANDROID_CPP_FEATURES=exceptions", "-DANDROID_STL=c++_static" - ndk.abiFilters = project.hasProperty("ABI_FILTERS") ? project.ABI_FILTERS.split(",") : - ["arm64-v8a", "armeabi-v7a", "armeabi", "x86", "x86_64"] - } - externalNativeBuild.cmake.path = "CMakeLists.txt" -} - -dependencies { - api project(":bugsnag-android-core") -} - -apply from: "../gradle/dependencies.gradle" -apply from: "../gradle/release.gradle" -apply from: "../gradle/detekt.gradle" -apply from: "../gradle/checkstyle.gradle" +apply from: "../bugsnag-android/build.gradle" diff --git a/bugsnag-android-ndk/src/main/AndroidManifest.xml b/bugsnag-android-ndk/src/main/AndroidManifest.xml index 6d65208857..c0e1ef95fa 100644 --- a/bugsnag-android-ndk/src/main/AndroidManifest.xml +++ b/bugsnag-android-ndk/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/bugsnag-android/README.md b/bugsnag-android/README.md index 7e5283121c..8ed8fd3162 100644 --- a/bugsnag-android/README.md +++ b/bugsnag-android/README.md @@ -11,7 +11,7 @@ implementation "com.bugsnag:bugsnag-android:$version" Which is simpler than manually specifying every single dependency: ``` -implementation "com.bugsnag:bugsnag-android-core:$version" -implementation "com.bugsnag:bugsnag-android-ndk:$version" -implementation "com.bugsnag:bugsnag-android-anr:$version" +implementation "com.bugsnag:bugsnag-plugin-android-jvm:$version" +implementation "com.bugsnag:bugsnag-plugin-android-ndk:$version" +implementation "com.bugsnag:bugsnag-plugin-android-anr:$version" ``` diff --git a/bugsnag-android/build.gradle b/bugsnag-android/build.gradle index 9f438d921b..bbe7600cd8 100644 --- a/bugsnag-android/build.gradle +++ b/bugsnag-android/build.gradle @@ -6,9 +6,9 @@ android { } dependencies { - api project(":bugsnag-android-core") - api project(":bugsnag-android-anr") - api project(":bugsnag-android-ndk") + api project(':bugsnag-plugin-android-jvm') + api project(':bugsnag-plugin-android-anr') + api project(':bugsnag-plugin-android-ndk') } apply from: "../gradle/release.gradle" diff --git a/bugsnag-android-anr/CMakeLists.txt b/bugsnag-plugin-android-anr/CMakeLists.txt similarity index 100% rename from bugsnag-android-anr/CMakeLists.txt rename to bugsnag-plugin-android-anr/CMakeLists.txt diff --git a/bugsnag-android-anr/README.md b/bugsnag-plugin-android-anr/README.md similarity index 91% rename from bugsnag-android-anr/README.md rename to bugsnag-plugin-android-anr/README.md index ee012eecfa..ef25f4626c 100644 --- a/bugsnag-android-anr/README.md +++ b/bugsnag-plugin-android-anr/README.md @@ -1,4 +1,4 @@ -# bugsnag-android-anr +# bugsnag-plugin-android-anr This module detects ANRs and reports them to bugsnag. diff --git a/bugsnag-android-anr/build.gradle b/bugsnag-plugin-android-anr/build.gradle similarity index 94% rename from bugsnag-android-anr/build.gradle rename to bugsnag-plugin-android-anr/build.gradle index 00f63c2171..513cdbbe8e 100644 --- a/bugsnag-android-anr/build.gradle +++ b/bugsnag-plugin-android-anr/build.gradle @@ -15,7 +15,7 @@ android { } dependencies { - api project(":bugsnag-android-core") + api project(':bugsnag-plugin-android-jvm') } apply from: "../gradle/dependencies.gradle" diff --git a/bugsnag-plugin-android-anr/gradle.properties b/bugsnag-plugin-android-anr/gradle.properties new file mode 100644 index 0000000000..0e68cfc63b --- /dev/null +++ b/bugsnag-plugin-android-anr/gradle.properties @@ -0,0 +1,2 @@ +pomName=Bugsnag Android ANR +artefactId=bugsnag-plugin-android-anr diff --git a/bugsnag-android-anr/proguard-rules.pro b/bugsnag-plugin-android-anr/proguard-rules.pro similarity index 100% rename from bugsnag-android-anr/proguard-rules.pro rename to bugsnag-plugin-android-anr/proguard-rules.pro diff --git a/bugsnag-android-anr/src/main/AndroidManifest.xml b/bugsnag-plugin-android-anr/src/main/AndroidManifest.xml similarity index 100% rename from bugsnag-android-anr/src/main/AndroidManifest.xml rename to bugsnag-plugin-android-anr/src/main/AndroidManifest.xml diff --git a/bugsnag-android-anr/src/main/CMakeLists.txt b/bugsnag-plugin-android-anr/src/main/CMakeLists.txt similarity index 86% rename from bugsnag-android-anr/src/main/CMakeLists.txt rename to bugsnag-plugin-android-anr/src/main/CMakeLists.txt index 8ab76fb888..8223623cb5 100644 --- a/bugsnag-android-anr/src/main/CMakeLists.txt +++ b/bugsnag-plugin-android-anr/src/main/CMakeLists.txt @@ -1,6 +1,6 @@ set(BUGSNAG_VERSION 1.0.1) add_library( # Specifies the name of the library. - bugsnag-android-anr + bugsnag-plugin-android-anr # Sets the library as a shared library. SHARED # Provides a relative path to your source file(s). @@ -19,11 +19,11 @@ find_library( # Defines the name of the path variable that stores the log ) target_link_libraries( # Specifies the target library. - bugsnag-android-anr + bugsnag-plugin-android-anr # Links the log library to the target library. ${log-lib}) -set_target_properties(bugsnag-android-anr +set_target_properties(bugsnag-plugin-android-anr PROPERTIES COMPILE_OPTIONS -Werror -Wall -pedantic) diff --git a/bugsnag-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt similarity index 93% rename from bugsnag-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt rename to bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt index c1132d5fa1..ef20bb1963 100644 --- a/bugsnag-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt +++ b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt @@ -7,7 +7,7 @@ internal class AnrPlugin : BugsnagPlugin { private external fun installAnrDetection(sentinelBuffer: ByteBuffer) override fun initialisePlugin(client: Client) { - System.loadLibrary("bugsnag-android-anr") + System.loadLibrary("bugsnag-plugin-android-anr") val delegate: (Thread) -> Unit = { handleAnr(it, client) } val monitor = AppNotRespondingMonitor(delegate) monitor.start() diff --git a/bugsnag-android-anr/src/main/java/com/bugsnag/android/AppNotRespondingMonitor.java b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AppNotRespondingMonitor.java similarity index 100% rename from bugsnag-android-anr/src/main/java/com/bugsnag/android/AppNotRespondingMonitor.java rename to bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AppNotRespondingMonitor.java diff --git a/bugsnag-android-anr/src/main/jni/anr_handler.c b/bugsnag-plugin-android-anr/src/main/jni/anr_handler.c similarity index 100% rename from bugsnag-android-anr/src/main/jni/anr_handler.c rename to bugsnag-plugin-android-anr/src/main/jni/anr_handler.c diff --git a/bugsnag-android-anr/src/main/jni/anr_handler.h b/bugsnag-plugin-android-anr/src/main/jni/anr_handler.h similarity index 100% rename from bugsnag-android-anr/src/main/jni/anr_handler.h rename to bugsnag-plugin-android-anr/src/main/jni/anr_handler.h diff --git a/bugsnag-android-anr/src/main/jni/bugsnag_anr.c b/bugsnag-plugin-android-anr/src/main/jni/bugsnag_anr.c similarity index 100% rename from bugsnag-android-anr/src/main/jni/bugsnag_anr.c rename to bugsnag-plugin-android-anr/src/main/jni/bugsnag_anr.c diff --git a/bugsnag-android-anr/src/main/jni/bugsnag_anr.h b/bugsnag-plugin-android-anr/src/main/jni/bugsnag_anr.h similarity index 84% rename from bugsnag-android-anr/src/main/jni/bugsnag_anr.h rename to bugsnag-plugin-android-anr/src/main/jni/bugsnag_anr.h index 419003ecff..a421d8f019 100644 --- a/bugsnag-android-anr/src/main/jni/bugsnag_anr.h +++ b/bugsnag-plugin-android-anr/src/main/jni/bugsnag_anr.h @@ -1,5 +1,5 @@ /** - * JNI interface between bugsnag-android-anr JVM and C++ + * JNI interface between bugsnag-plugin-android-anr JVM and C++ */ #ifndef BUGSNAG_ANR_H #define BUGSNAG_ANR_H diff --git a/bugsnag-android-anr/src/main/jni/utils/string.c b/bugsnag-plugin-android-anr/src/main/jni/utils/string.c similarity index 100% rename from bugsnag-android-anr/src/main/jni/utils/string.c rename to bugsnag-plugin-android-anr/src/main/jni/utils/string.c diff --git a/bugsnag-android-anr/src/main/jni/utils/string.h b/bugsnag-plugin-android-anr/src/main/jni/utils/string.h similarity index 100% rename from bugsnag-android-anr/src/main/jni/utils/string.h rename to bugsnag-plugin-android-anr/src/main/jni/utils/string.h diff --git a/bugsnag-android-core/README.md b/bugsnag-plugin-android-jvm/README.md similarity index 92% rename from bugsnag-android-core/README.md rename to bugsnag-plugin-android-jvm/README.md index 3d48abdb06..ebc7c692de 100644 --- a/bugsnag-android-core/README.md +++ b/bugsnag-plugin-android-jvm/README.md @@ -1,4 +1,4 @@ -# bugsnag-android-core +# bugsnag-plugin-android-jvm This module detects JVM exceptions and reports them to bugsnag. diff --git a/bugsnag-android-core/build.gradle b/bugsnag-plugin-android-jvm/build.gradle similarity index 100% rename from bugsnag-android-core/build.gradle rename to bugsnag-plugin-android-jvm/build.gradle diff --git a/bugsnag-plugin-android-jvm/gradle.properties b/bugsnag-plugin-android-jvm/gradle.properties new file mode 100644 index 0000000000..1242646287 --- /dev/null +++ b/bugsnag-plugin-android-jvm/gradle.properties @@ -0,0 +1,2 @@ +pomName=Bugsnag Android Core +artefactId=bugsnag-plugin-android-jvm diff --git a/bugsnag-android-core/proguard-rules.pro b/bugsnag-plugin-android-jvm/proguard-rules.pro similarity index 100% rename from bugsnag-android-core/proguard-rules.pro rename to bugsnag-plugin-android-jvm/proguard-rules.pro diff --git a/bugsnag-android-core/src/androidTest/AndroidManifest.xml b/bugsnag-plugin-android-jvm/src/androidTest/AndroidManifest.xml similarity index 100% rename from bugsnag-android-core/src/androidTest/AndroidManifest.xml rename to bugsnag-plugin-android-jvm/src/androidTest/AndroidManifest.xml diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AnrConfigTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AnrConfigTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AnrConfigTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AnrConfigTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataOverrideTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AppDataOverrideTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataOverrideTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AppDataOverrideTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataSummaryTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AppDataSummaryTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataSummaryTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AppDataSummaryTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AppDataTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/AppDataTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeRecordBreadcrumbsTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BeforeRecordBreadcrumbsTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeRecordBreadcrumbsTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BeforeRecordBreadcrumbsTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeSendTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BeforeSendTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeSendTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BeforeSendTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BugsnagPluginInterfaceTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BugsnagPluginInterfaceTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BugsnagPluginInterfaceTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BugsnagPluginInterfaceTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/CachedThreadTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/CachedThreadTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/CachedThreadTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/CachedThreadTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientConfigTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ClientConfigTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientConfigTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ClientConfigTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientNotifyTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ClientNotifyTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientNotifyTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ClientNotifyTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ClientTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ClientTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/CustomException.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/CustomException.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/CustomException.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/CustomException.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeviceDataSummaryTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/DeviceDataSummaryTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeviceDataSummaryTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/DeviceDataSummaryTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorFilenameTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorFilenameTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorFilenameTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorFilenameTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorReaderTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorReaderTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorReaderTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorReaderTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorReportApiClientTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorReportApiClientTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorReportApiClientTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorReportApiClientTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ErrorTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ErrorTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/EventReceiverTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/EventReceiverTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/EventReceiverTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/EventReceiverTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ExceptionHandlerTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ExceptionHandlerTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ExceptionHandlerTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ExceptionHandlerTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/FileUtils.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/FileUtils.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/FileUtils.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/FileUtils.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/HandledStateTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/HandledStateTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/HandledStateTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/HandledStateTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/JsonWriterBugsnagTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/JsonWriterBugsnagTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/JsonWriterBugsnagTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/JsonWriterBugsnagTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/JsonWriterTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/JsonWriterTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/JsonWriterTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/JsonWriterTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MetaDataMergeTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/MetaDataMergeTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MetaDataMergeTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/MetaDataMergeTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MetaDataTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/MetaDataTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/MetaDataTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/MetaDataTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/NativeInterfaceTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/NativeInterfaceTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/NativeInterfaceTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/NativeInterfaceTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/NotifierTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/NotifierTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/NotifierTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/NotifierTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ProjectPackagesTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ProjectPackagesTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ProjectPackagesTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ProjectPackagesTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ReportTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ReportTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ReportTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ReportTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/RxErrorTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/RxErrorTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/RxErrorTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/RxErrorTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTrackerStopResumeTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTrackerStopResumeTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTrackerStopResumeTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTrackerStopResumeTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/StacktraceTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/StacktraceTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/StacktraceTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/StacktraceTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/StrictModeTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/StrictModeTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/StrictModeTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/StrictModeTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/StrictModeWrapper.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/StrictModeWrapper.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/StrictModeWrapper.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/StrictModeWrapper.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/TestRunListener.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/TestRunListener.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/TestRunListener.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/TestRunListener.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ThreadStateTest.kt b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ThreadStateTest.kt similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ThreadStateTest.kt rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/ThreadStateTest.kt diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/UniqueBeforeNotifyTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/UniqueBeforeNotifyTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/UniqueBeforeNotifyTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/UniqueBeforeNotifyTest.java diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/UserTest.java b/bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/UserTest.java similarity index 100% rename from bugsnag-android-core/src/androidTest/java/com/bugsnag/android/UserTest.java rename to bugsnag-plugin-android-jvm/src/androidTest/java/com/bugsnag/android/UserTest.java diff --git a/bugsnag-android-core/src/androidTest/resources/error.json b/bugsnag-plugin-android-jvm/src/androidTest/resources/error.json similarity index 100% rename from bugsnag-android-core/src/androidTest/resources/error.json rename to bugsnag-plugin-android-jvm/src/androidTest/resources/error.json diff --git a/bugsnag-android-core/src/androidTest/resources/rx_error.json b/bugsnag-plugin-android-jvm/src/androidTest/resources/rx_error.json similarity index 100% rename from bugsnag-android-core/src/androidTest/resources/rx_error.json rename to bugsnag-plugin-android-jvm/src/androidTest/resources/rx_error.json diff --git a/bugsnag-android-core/src/main/AndroidManifest.xml b/bugsnag-plugin-android-jvm/src/main/AndroidManifest.xml similarity index 100% rename from bugsnag-android-core/src/main/AndroidManifest.xml rename to bugsnag-plugin-android-jvm/src/main/AndroidManifest.xml diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/AppData.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/AppData.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/AppData.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/AppData.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Async.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Async.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Async.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Async.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BadResponseException.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BadResponseException.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BadResponseException.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BadResponseException.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeNotify.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeNotify.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeNotify.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeNotify.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeRecordBreadcrumb.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeRecordBreadcrumb.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeRecordBreadcrumb.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeRecordBreadcrumb.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeSend.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeSend.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeSend.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeSend.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeSendSession.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeSendSession.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BeforeSendSession.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BeforeSendSession.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Breadcrumb.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Breadcrumb.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Breadcrumb.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Breadcrumb.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BreadcrumbType.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BreadcrumbType.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BreadcrumbType.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BreadcrumbType.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Breadcrumbs.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Breadcrumbs.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Breadcrumbs.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Breadcrumbs.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Bugsnag.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Bugsnag.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Bugsnag.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Bugsnag.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BugsnagException.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BugsnagException.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BugsnagException.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BugsnagException.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BugsnagPluginInterface.kt b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BugsnagPluginInterface.kt similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/BugsnagPluginInterface.kt rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/BugsnagPluginInterface.kt diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/CachedThread.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/CachedThread.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/CachedThread.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/CachedThread.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Callback.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Callback.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Callback.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Callback.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Client.java similarity index 99% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Client.java index dea972b883..1677d17139 100644 --- a/bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java +++ b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Client.java @@ -257,7 +257,7 @@ private void loadPlugins() { try { pluginInterface.registerPlugin(Class.forName("com.bugsnag.android.NdkPlugin")); } catch (ClassNotFoundException exc) { - Logger.warn("bugsnag-android-ndk artefact not found on classpath, " + Logger.warn("bugsnag-plugin-android-ndk artefact not found on classpath, " + "NDK errors will not be captured."); } } @@ -265,7 +265,7 @@ private void loadPlugins() { try { pluginInterface.registerPlugin(Class.forName("com.bugsnag.android.AnrPlugin")); } catch (ClassNotFoundException exc) { - Logger.warn("bugsnag-android-anr artefact not found on classpath, " + Logger.warn("bugsnag-plugin-android-anr artefact not found on classpath, " + "ANR errors will not be captured."); } } diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConfigFactory.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ConfigFactory.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ConfigFactory.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ConfigFactory.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Configuration.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Configuration.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Configuration.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Configuration.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ConnectivityCompat.kt similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ConnectivityCompat.kt diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/DateUtils.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DateUtils.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/DateUtils.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DateUtils.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/DefaultDelivery.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DefaultDelivery.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/DefaultDelivery.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DefaultDelivery.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Delivery.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Delivery.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Delivery.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Delivery.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/DeliveryCompat.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeliveryCompat.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/DeliveryCompat.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeliveryCompat.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/DeliveryFailureException.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeliveryFailureException.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/DeliveryFailureException.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeliveryFailureException.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/DeliveryStyle.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeliveryStyle.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/DeliveryStyle.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeliveryStyle.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/DeviceData.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeviceData.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/DeviceData.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/DeviceData.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Error.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Error.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Error.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Error.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ErrorReader.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ErrorReader.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ErrorReader.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ErrorReader.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ErrorReportApiClient.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ErrorReportApiClient.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ErrorReportApiClient.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ErrorReportApiClient.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ErrorStore.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ErrorStore.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ErrorStore.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ErrorStore.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/EventReceiver.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/EventReceiver.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/EventReceiver.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/EventReceiver.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ExceptionHandler.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ExceptionHandler.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ExceptionHandler.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ExceptionHandler.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Exceptions.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Exceptions.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Exceptions.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Exceptions.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/FileStore.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/FileStore.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/FileStore.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/FileStore.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ForegroundDetector.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ForegroundDetector.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ForegroundDetector.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ForegroundDetector.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/HandledState.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/HandledState.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/HandledState.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/HandledState.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/IOUtils.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/IOUtils.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/IOUtils.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/IOUtils.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/InternalApi.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/InternalApi.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/InternalApi.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/InternalApi.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/JsonScope.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/JsonScope.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/JsonScope.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/JsonScope.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/JsonStream.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/JsonStream.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/JsonStream.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/JsonStream.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/JsonWriter.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/JsonWriter.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/JsonWriter.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/JsonWriter.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Logger.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Logger.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Logger.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Logger.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/MapUtils.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/MapUtils.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/MapUtils.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/MapUtils.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/MetaData.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/MetaData.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/MetaData.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/MetaData.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/NativeInterface.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/NativeInterface.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/NativeInterface.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/NativeInterface.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/NetworkException.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/NetworkException.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/NetworkException.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/NetworkException.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Notifier.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Notifier.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/NotifyType.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/NotifyType.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/NotifyType.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/NotifyType.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ObjectJsonStreamer.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ObjectJsonStreamer.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ObjectJsonStreamer.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ObjectJsonStreamer.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Report.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Report.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Report.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Report.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Session.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Session.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Session.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Session.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionStore.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionStore.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/SessionStore.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionStore.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionTracker.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionTracker.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTrackingPayload.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionTrackingPayload.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTrackingPayload.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/SessionTrackingPayload.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Severity.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Severity.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Severity.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Severity.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Stacktrace.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Stacktrace.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/Stacktrace.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/Stacktrace.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/StrictModeHandler.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/StrictModeHandler.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/StrictModeHandler.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/StrictModeHandler.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ThreadSafe.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ThreadSafe.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ThreadSafe.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ThreadSafe.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ThreadState.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ThreadState.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/ThreadState.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/ThreadState.java diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/User.java b/bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/User.java similarity index 100% rename from bugsnag-android-core/src/main/java/com/bugsnag/android/User.java rename to bugsnag-plugin-android-jvm/src/main/java/com/bugsnag/android/User.java diff --git a/bugsnag-android-ndk/CMakeLists.txt b/bugsnag-plugin-android-ndk/CMakeLists.txt similarity index 100% rename from bugsnag-android-ndk/CMakeLists.txt rename to bugsnag-plugin-android-ndk/CMakeLists.txt diff --git a/bugsnag-plugin-android-ndk/README.md b/bugsnag-plugin-android-ndk/README.md new file mode 100644 index 0000000000..ae7be5b05b --- /dev/null +++ b/bugsnag-plugin-android-ndk/README.md @@ -0,0 +1,9 @@ +# bugsnag-plugin-android-ndk + +This module detects NDK signals/exceptions and reports them to bugsnag. + +## High-level Overview + +This module installs C signal handlers and a CPP exception handler. When a native crash occurs, +it writes a report to disk. This is then converted to a JVM report on the next app launch, and is +delivered to the error reporting API. diff --git a/bugsnag-plugin-android-ndk/build.gradle b/bugsnag-plugin-android-ndk/build.gradle new file mode 100644 index 0000000000..513cdbbe8e --- /dev/null +++ b/bugsnag-plugin-android-ndk/build.gradle @@ -0,0 +1,24 @@ +apply plugin: "com.android.library" +apply plugin: "kotlin-android" +apply plugin: "io.gitlab.arturbosch.detekt" + +android { + compileSdkVersion rootProject.ext.compileSdkVersion + + defaultConfig { + minSdkVersion rootProject.ext.minSdkVersion + externalNativeBuild.cmake.arguments "-DANDROID_CPP_FEATURES=exceptions", "-DANDROID_STL=c++_static" + ndk.abiFilters = project.hasProperty("ABI_FILTERS") ? project.ABI_FILTERS.split(",") : + ["arm64-v8a", "armeabi-v7a", "armeabi", "x86", "x86_64"] + } + externalNativeBuild.cmake.path = "CMakeLists.txt" +} + +dependencies { + api project(':bugsnag-plugin-android-jvm') +} + +apply from: "../gradle/dependencies.gradle" +apply from: "../gradle/release.gradle" +apply from: "../gradle/detekt.gradle" +apply from: "../gradle/checkstyle.gradle" diff --git a/bugsnag-plugin-android-ndk/gradle.properties b/bugsnag-plugin-android-ndk/gradle.properties new file mode 100644 index 0000000000..3418220e53 --- /dev/null +++ b/bugsnag-plugin-android-ndk/gradle.properties @@ -0,0 +1,2 @@ +pomName=Bugsnag Android NDK +artefactId=bugsnag-plugin-android-ndk diff --git a/bugsnag-android-ndk/package.json b/bugsnag-plugin-android-ndk/package.json similarity index 100% rename from bugsnag-android-ndk/package.json rename to bugsnag-plugin-android-ndk/package.json diff --git a/bugsnag-android-ndk/proguard-rules.pro b/bugsnag-plugin-android-ndk/proguard-rules.pro similarity index 100% rename from bugsnag-android-ndk/proguard-rules.pro rename to bugsnag-plugin-android-ndk/proguard-rules.pro diff --git a/bugsnag-android-ndk/src/androidTest/java/com/bugsnag/android/ndk/NativeCXXTest.java b/bugsnag-plugin-android-ndk/src/androidTest/java/com/bugsnag/android/ndk/NativeCXXTest.java similarity index 100% rename from bugsnag-android-ndk/src/androidTest/java/com/bugsnag/android/ndk/NativeCXXTest.java rename to bugsnag-plugin-android-ndk/src/androidTest/java/com/bugsnag/android/ndk/NativeCXXTest.java diff --git a/bugsnag-plugin-android-ndk/src/main/AndroidManifest.xml b/bugsnag-plugin-android-ndk/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..6d65208857 --- /dev/null +++ b/bugsnag-plugin-android-ndk/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/bugsnag-android-ndk/src/main/CMakeLists.txt b/bugsnag-plugin-android-ndk/src/main/CMakeLists.txt similarity index 100% rename from bugsnag-android-ndk/src/main/CMakeLists.txt rename to bugsnag-plugin-android-ndk/src/main/CMakeLists.txt diff --git a/bugsnag-android-ndk/src/main/assets/include/bugsnag.h b/bugsnag-plugin-android-ndk/src/main/assets/include/bugsnag.h similarity index 100% rename from bugsnag-android-ndk/src/main/assets/include/bugsnag.h rename to bugsnag-plugin-android-ndk/src/main/assets/include/bugsnag.h diff --git a/bugsnag-android-ndk/src/main/assets/include/report.h b/bugsnag-plugin-android-ndk/src/main/assets/include/report.h similarity index 100% rename from bugsnag-android-ndk/src/main/assets/include/report.h rename to bugsnag-plugin-android-ndk/src/main/assets/include/report.h diff --git a/bugsnag-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt b/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt similarity index 100% rename from bugsnag-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt rename to bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt diff --git a/bugsnag-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java b/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java similarity index 100% rename from bugsnag-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java rename to bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java diff --git a/bugsnag-android-ndk/src/main/jni/bugsnag.c b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/bugsnag.c rename to bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c diff --git a/bugsnag-android-ndk/src/main/jni/bugsnag_ndk.c b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/bugsnag_ndk.c rename to bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c diff --git a/bugsnag-android-ndk/src/main/jni/bugsnag_ndk.h b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/bugsnag_ndk.h rename to bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.h diff --git a/bugsnag-android-ndk/src/main/jni/deps/parson/package.json b/bugsnag-plugin-android-ndk/src/main/jni/deps/parson/package.json similarity index 100% rename from bugsnag-android-ndk/src/main/jni/deps/parson/package.json rename to bugsnag-plugin-android-ndk/src/main/jni/deps/parson/package.json diff --git a/bugsnag-android-ndk/src/main/jni/deps/parson/parson.c b/bugsnag-plugin-android-ndk/src/main/jni/deps/parson/parson.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/deps/parson/parson.c rename to bugsnag-plugin-android-ndk/src/main/jni/deps/parson/parson.c diff --git a/bugsnag-android-ndk/src/main/jni/deps/parson/parson.h b/bugsnag-plugin-android-ndk/src/main/jni/deps/parson/parson.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/deps/parson/parson.h rename to bugsnag-plugin-android-ndk/src/main/jni/deps/parson/parson.h diff --git a/bugsnag-android-ndk/src/main/jni/external/libunwind/include/__libunwind_config.h b/bugsnag-plugin-android-ndk/src/main/jni/external/libunwind/include/__libunwind_config.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/external/libunwind/include/__libunwind_config.h rename to bugsnag-plugin-android-ndk/src/main/jni/external/libunwind/include/__libunwind_config.h diff --git a/bugsnag-android-ndk/src/main/jni/external/libunwind/include/libunwind.h b/bugsnag-plugin-android-ndk/src/main/jni/external/libunwind/include/libunwind.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/external/libunwind/include/libunwind.h rename to bugsnag-plugin-android-ndk/src/main/jni/external/libunwind/include/libunwind.h diff --git a/bugsnag-android-ndk/src/main/jni/external/libunwindstack-ndk b/bugsnag-plugin-android-ndk/src/main/jni/external/libunwindstack-ndk similarity index 100% rename from bugsnag-android-ndk/src/main/jni/external/libunwindstack-ndk rename to bugsnag-plugin-android-ndk/src/main/jni/external/libunwindstack-ndk diff --git a/bugsnag-android-ndk/src/main/jni/handlers/cpp_handler.cpp b/bugsnag-plugin-android-ndk/src/main/jni/handlers/cpp_handler.cpp similarity index 100% rename from bugsnag-android-ndk/src/main/jni/handlers/cpp_handler.cpp rename to bugsnag-plugin-android-ndk/src/main/jni/handlers/cpp_handler.cpp diff --git a/bugsnag-android-ndk/src/main/jni/handlers/cpp_handler.h b/bugsnag-plugin-android-ndk/src/main/jni/handlers/cpp_handler.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/handlers/cpp_handler.h rename to bugsnag-plugin-android-ndk/src/main/jni/handlers/cpp_handler.h diff --git a/bugsnag-android-ndk/src/main/jni/handlers/signal_handler.c b/bugsnag-plugin-android-ndk/src/main/jni/handlers/signal_handler.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/handlers/signal_handler.c rename to bugsnag-plugin-android-ndk/src/main/jni/handlers/signal_handler.c diff --git a/bugsnag-android-ndk/src/main/jni/handlers/signal_handler.h b/bugsnag-plugin-android-ndk/src/main/jni/handlers/signal_handler.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/handlers/signal_handler.h rename to bugsnag-plugin-android-ndk/src/main/jni/handlers/signal_handler.h diff --git a/bugsnag-android-ndk/src/main/jni/metadata.c b/bugsnag-plugin-android-ndk/src/main/jni/metadata.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/metadata.c rename to bugsnag-plugin-android-ndk/src/main/jni/metadata.c diff --git a/bugsnag-android-ndk/src/main/jni/metadata.h b/bugsnag-plugin-android-ndk/src/main/jni/metadata.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/metadata.h rename to bugsnag-plugin-android-ndk/src/main/jni/metadata.h diff --git a/bugsnag-android-ndk/src/main/jni/report.c b/bugsnag-plugin-android-ndk/src/main/jni/report.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/report.c rename to bugsnag-plugin-android-ndk/src/main/jni/report.c diff --git a/bugsnag-android-ndk/src/main/jni/report.h b/bugsnag-plugin-android-ndk/src/main/jni/report.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/report.h rename to bugsnag-plugin-android-ndk/src/main/jni/report.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/build.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/build.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/build.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/build.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/crash_info.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/crash_info.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/crash_info.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/crash_info.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/crash_info.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/crash_info.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/crash_info.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/crash_info.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/migrate.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/migrate.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/migrate.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/migrate.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/serializer.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/serializer.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/serializer.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/serializer.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/serializer.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/serializer.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/serializer.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/serializer.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libcorkscrew.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwind.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.cpp b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.cpp similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.cpp rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.cpp diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_libunwindstack.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_simple.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_simple.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_simple.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_simple.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_simple.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_simple.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/stack_unwinder_simple.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/stack_unwinder_simple.h diff --git a/bugsnag-android-ndk/src/main/jni/utils/string.c b/bugsnag-plugin-android-ndk/src/main/jni/utils/string.c similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/string.c rename to bugsnag-plugin-android-ndk/src/main/jni/utils/string.c diff --git a/bugsnag-android-ndk/src/main/jni/utils/string.h b/bugsnag-plugin-android-ndk/src/main/jni/utils/string.h similarity index 100% rename from bugsnag-android-ndk/src/main/jni/utils/string.h rename to bugsnag-plugin-android-ndk/src/main/jni/utils/string.h diff --git a/bugsnag-android-ndk/src/test/CMakeLists.txt b/bugsnag-plugin-android-ndk/src/test/CMakeLists.txt similarity index 100% rename from bugsnag-android-ndk/src/test/CMakeLists.txt rename to bugsnag-plugin-android-ndk/src/test/CMakeLists.txt diff --git a/bugsnag-android-ndk/src/test/cpp/deps/greatest/greatest.h b/bugsnag-plugin-android-ndk/src/test/cpp/deps/greatest/greatest.h similarity index 100% rename from bugsnag-android-ndk/src/test/cpp/deps/greatest/greatest.h rename to bugsnag-plugin-android-ndk/src/test/cpp/deps/greatest/greatest.h diff --git a/bugsnag-android-ndk/src/test/cpp/deps/greatest/package.json b/bugsnag-plugin-android-ndk/src/test/cpp/deps/greatest/package.json similarity index 100% rename from bugsnag-android-ndk/src/test/cpp/deps/greatest/package.json rename to bugsnag-plugin-android-ndk/src/test/cpp/deps/greatest/package.json diff --git a/bugsnag-android-ndk/src/test/cpp/main.c b/bugsnag-plugin-android-ndk/src/test/cpp/main.c similarity index 100% rename from bugsnag-android-ndk/src/test/cpp/main.c rename to bugsnag-plugin-android-ndk/src/test/cpp/main.c diff --git a/bugsnag-android-ndk/src/test/cpp/test_breadcrumbs.c b/bugsnag-plugin-android-ndk/src/test/cpp/test_breadcrumbs.c similarity index 100% rename from bugsnag-android-ndk/src/test/cpp/test_breadcrumbs.c rename to bugsnag-plugin-android-ndk/src/test/cpp/test_breadcrumbs.c diff --git a/bugsnag-android-ndk/src/test/cpp/test_utils_serialize.c b/bugsnag-plugin-android-ndk/src/test/cpp/test_utils_serialize.c similarity index 100% rename from bugsnag-android-ndk/src/test/cpp/test_utils_serialize.c rename to bugsnag-plugin-android-ndk/src/test/cpp/test_utils_serialize.c diff --git a/bugsnag-android-ndk/src/test/cpp/test_utils_string.c b/bugsnag-plugin-android-ndk/src/test/cpp/test_utils_string.c similarity index 100% rename from bugsnag-android-ndk/src/test/cpp/test_utils_string.c rename to bugsnag-plugin-android-ndk/src/test/cpp/test_utils_string.c diff --git a/dockerfiles/Dockerfile.android-base b/dockerfiles/Dockerfile.android-base index bc099e7442..6682b08b67 100644 --- a/dockerfiles/Dockerfile.android-base +++ b/dockerfiles/Dockerfile.android-base @@ -19,9 +19,10 @@ WORKDIR /app COPY gradlew build.gradle settings.gradle gradle.properties /app/ COPY gradle/ /app/gradle/ COPY bugsnag-android/ bugsnag-android/ -COPY bugsnag-android-anr/ bugsnag-android-anr/ -COPY bugsnag-android-core/ bugsnag-android-core/ COPY bugsnag-android-ndk/ bugsnag-android-ndk/ +COPY bugsnag-plugin-android-anr/ bugsnag-plugin-android-anr/ +COPY bugsnag-plugin-android-jvm/ bugsnag-plugin-android-jvm/ +COPY bugsnag-plugin-android-ndk/ bugsnag-plugin-android-ndk/ COPY examples/ examples/ COPY scripts/ scripts/ diff --git a/dockerfiles/Dockerfile.android-builder b/dockerfiles/Dockerfile.android-builder index d74a9f4344..60d8832d1f 100644 --- a/dockerfiles/Dockerfile.android-builder +++ b/dockerfiles/Dockerfile.android-builder @@ -19,9 +19,10 @@ WORKDIR /app COPY gradlew build.gradle settings.gradle gradle.properties /app/ COPY gradle/ /app/gradle/ COPY bugsnag-android/ bugsnag-android/ -COPY bugsnag-android-anr/ bugsnag-android-anr/ -COPY bugsnag-android-core/ bugsnag-android-core/ COPY bugsnag-android-ndk/ bugsnag-android-ndk/ +COPY bugsnag-plugin-android-anr/ bugsnag-plugin-android-anr/ +COPY bugsnag-plugin-android-jvm/ bugsnag-plugin-android-jvm/ +COPY bugsnag-plugin-android-ndk/ bugsnag-plugin-android-ndk/ COPY examples/ examples/ COPY scripts/ scripts/ diff --git a/dockerfiles/Dockerfile.android-instrumentation-tests b/dockerfiles/Dockerfile.android-instrumentation-tests index dcd3af226f..4d2b4c5180 100644 --- a/dockerfiles/Dockerfile.android-instrumentation-tests +++ b/dockerfiles/Dockerfile.android-instrumentation-tests @@ -19,9 +19,10 @@ WORKDIR /app COPY gradlew build.gradle settings.gradle gradle.properties /app/ COPY gradle/ /app/gradle/ COPY bugsnag-android/ bugsnag-android/ -COPY bugsnag-android-anr/ bugsnag-android-anr/ -COPY bugsnag-android-core/ bugsnag-android-core/ COPY bugsnag-android-ndk/ bugsnag-android-ndk/ +COPY bugsnag-plugin-android-anr/ bugsnag-plugin-android-anr/ +COPY bugsnag-plugin-android-jvm/ bugsnag-plugin-android-jvm/ +COPY bugsnag-plugin-android-ndk/ bugsnag-plugin-android-ndk/ COPY examples/ examples/ COPY scripts/ scripts/ @@ -30,5 +31,5 @@ RUN scripts/install-ndk.sh RUN ./gradlew # Everything above this point should be derived from android-base -RUN sed --in-place="" --expression='s/"armeabi",//' bugsnag-android-anr/build.gradle bugsnag-android-ndk/build.gradle +RUN sed --in-place="" --expression='s/"armeabi",//' bugsnag-plugin-android-anr/build.gradle bugsnag-plugin-android-ndk/build.gradle CMD ./scripts/build-instrumentation-tests.sh && ./scripts/run-instrumentation-test.sh diff --git a/dockerfiles/Dockerfile.android-linter b/dockerfiles/Dockerfile.android-linter index 7d206d1f3c..545c59da73 100644 --- a/dockerfiles/Dockerfile.android-linter +++ b/dockerfiles/Dockerfile.android-linter @@ -19,9 +19,10 @@ WORKDIR /app COPY gradlew build.gradle settings.gradle gradle.properties /app/ COPY gradle/ /app/gradle/ COPY bugsnag-android/ bugsnag-android/ -COPY bugsnag-android-anr/ bugsnag-android-anr/ -COPY bugsnag-android-core/ bugsnag-android-core/ COPY bugsnag-android-ndk/ bugsnag-android-ndk/ +COPY bugsnag-plugin-android-anr/ bugsnag-plugin-android-anr/ +COPY bugsnag-plugin-android-jvm/ bugsnag-plugin-android-jvm/ +COPY bugsnag-plugin-android-ndk/ bugsnag-plugin-android-ndk/ COPY examples/ examples/ COPY scripts/ scripts/ @@ -35,11 +36,11 @@ RUN apt-get install -y cppcheck COPY examples/sdk-app-example/ examples/sdk-app-example/ COPY config/ config/ -RUN sed --in-place="" --expression="s/'armeabi',//" bugsnag-android-anr/build.gradle \ - bugsnag-android-ndk/build.gradle examples/sdk-app-example/build.gradle +RUN sed --in-place="" --expression="s/'armeabi',//" bugsnag-plugin-android-anr/build.gradle \ + bugsnag-plugin-android-ndk/build.gradle examples/sdk-app-example/build.gradle CMD ./gradlew lint checkstyle detekt && \ - cppcheck --enable=warning,performance bugsnag-android-anr/src/main/jni && \ - cppcheck --enable=warning,performance bugsnag-android-ndk/src/main/jni -i \ - bugsnag-android-ndk/src/main/jni/deps -i bugsnag-android-ndk/src/main/jni/external + cppcheck --enable=warning,performance bugsnag-plugin-android-anr/src/main/jni && \ + cppcheck --enable=warning,performance bugsnag-plugin-android-ndk/src/main/jni -i \ + bugsnag-plugin-android-ndk/src/main/jni/deps -i bugsnag-plugin-android-ndk/src/main/jni/external diff --git a/examples/sdk-app-example/ndk_local_setup.gradle b/examples/sdk-app-example/ndk_local_setup.gradle index f53fa2bb60..508fbd186a 100644 --- a/examples/sdk-app-example/ndk_local_setup.gradle +++ b/examples/sdk-app-example/ndk_local_setup.gradle @@ -33,7 +33,7 @@ class BugsnagTestNdkSetupTask extends DefaultTask { } } catch (Exception e) {} // some configurations cannot be directly resolved } - throw new Exception("SOLUTION: The bugsnag-android-ndk file was not found, please run `./gradlew ndk:assembleRelease`") + throw new Exception("SOLUTION: The bugsnag-plugin-android-ndk file was not found, please run `./gradlew ndk:assembleRelease`") } } diff --git a/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleActivity.kt b/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleActivity.kt index bd5650aab6..3d71a20ac0 100644 --- a/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleActivity.kt +++ b/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleActivity.kt @@ -27,6 +27,7 @@ class ExampleActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.main) setupToolbarLogo() + performAdditionalBugsnagSetup() val view: View = findViewById(R.id.btn_fatal_crash) view.setOnClickListener(::crashUnhandled) @@ -172,11 +173,9 @@ class ExampleActivity : AppCompatActivity() { @Suppress("UNUSED_PARAMETER") fun readDocs(view: View) { - Bugsnag.init(this) -// -// val uri = Uri.parse("https://docs.bugsnag.com/platforms/android/sdk/") -// val intent = Intent(Intent.ACTION_VIEW, uri) -// startActivity(intent) + val uri = Uri.parse("https://docs.bugsnag.com/platforms/android/sdk/") + val intent = Intent(Intent.ACTION_VIEW, uri) + startActivity(intent) } private fun generateUserMetaData(): MetaData { diff --git a/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleApplication.kt b/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleApplication.kt index b03d0bfc2b..33c2606a64 100644 --- a/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleApplication.kt +++ b/examples/sdk-app-example/src/main/java/com.bugsnag.android/example/ExampleApplication.kt @@ -7,6 +7,7 @@ class ExampleApplication : Application() { override fun onCreate() { super.onCreate() + Bugsnag.init(this) } } diff --git a/settings.gradle b/settings.gradle index d9fef9278d..f0272ed29d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,9 @@ -include ":bugsnag-android", ":bugsnag-android-core", ":bugsnag-android-anr", - ":bugsnag-android-ndk", ":sdkAppExample" +include( + ":bugsnag-android", + ":bugsnag-android-ndk", + ':bugsnag-plugin-android-jvm', + ':bugsnag-plugin-android-anr', + ':bugsnag-plugin-android-ndk', + ":sdkAppExample" +) project(":sdkAppExample").projectDir = new File("examples/sdk-app-example")