diff --git a/.travis.yml b/.travis.yml index b19f66a6a7..73b95ced08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,9 @@ before_script: - while [[ `adb shell pm path android` == 'Error'* ]]; do sleep 2; done - adb shell input keyevent 82 & -script: ./gradlew lint checkstyle createDebugCoverageReport coveralls +script: +- ./gradlew lint checkstyle createDebugCoverageReport coveralls +- cd examples/sdk-app-example && ../../gradlew lint checkstyle connectedCheck sudo: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26d393f70f..e5bbacc65a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,7 +98,7 @@ Building the Example App You can build and install the example app to as follows: ```shell -./gradlew clean example:installJavaExampleDebug +cd examples/sdk-app-example && ../../gradlew clean installJavaExampleDebug ``` This builds the latest version of the library and installs an app onto your diff --git a/example/.gitignore b/examples/sdk-app-example/.gitignore similarity index 100% rename from example/.gitignore rename to examples/sdk-app-example/.gitignore diff --git a/example/README.md b/examples/sdk-app-example/README.md similarity index 100% rename from example/README.md rename to examples/sdk-app-example/README.md diff --git a/example/build.gradle b/examples/sdk-app-example/build.gradle similarity index 76% rename from example/build.gradle rename to examples/sdk-app-example/build.gradle index 3cf0ec0d0f..eed51f877c 100644 --- a/example/build.gradle +++ b/examples/sdk-app-example/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { google() jcenter() - mavenLocal() } dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.1.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.30" } } @@ -19,12 +20,12 @@ repositories { android { - compileSdkVersion Integer.parseInt(project.ANDROID_COMPILE_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + compileSdkVersion 27 + buildToolsVersion "27.0.0" defaultConfig { - minSdkVersion Integer.parseInt(project.ANDROID_MIN_SDK_VERSION) - targetSdkVersion Integer.parseInt(project.ANDROID_TARGET_SDK_VERSION) + minSdkVersion 14 + targetSdkVersion 27 manifestPlaceholders = [ bugsnagApiKey : "your-api-key", @@ -86,18 +87,18 @@ android { } dependencies { - implementation project(":sdk") - implementation "com.android.support:appcompat-v7:$supportLibVersion" - implementation "com.android.support:support-v4:$supportLibVersion" - kotlinExampleImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "com.bugsnag:bugsnag-android:4.6.1" + implementation "com.android.support:appcompat-v7:27.0.0" + implementation "com.android.support:support-v4:27.0.0" + kotlinExampleImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.30" - androidTestImplementation "com.android.support.test:runner:$supportTestVersion", { + androidTestImplementation "com.android.support.test:runner:0.5", { exclude group: 'com.android.support', module: 'support-annotations' } - androidTestImplementation "com.android.support.test:rules:$supportTestVersion", { + androidTestImplementation "com.android.support.test:rules:0.5", { exclude group: 'com.android.support', module: 'support-annotations' } - androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion", { + androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2", { exclude group: 'com.android.support', module: 'support-annotations' } } @@ -110,7 +111,7 @@ checkstyle { toolVersion = "6.16" } task("checkstyle", type: Checkstyle) { - configFile rootProject.file("config/checkstyle/checkstyle.xml") + configFile rootProject.file("../../config/checkstyle/checkstyle.xml") source "src/javaExample/java" include "**/*.java" classpath = files() diff --git a/example/proguard.pro b/examples/sdk-app-example/proguard.pro similarity index 100% rename from example/proguard.pro rename to examples/sdk-app-example/proguard.pro diff --git a/example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java b/examples/sdk-app-example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java similarity index 94% rename from example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java rename to examples/sdk-app-example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java index 86407e174c..4f00be8865 100644 --- a/example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java +++ b/examples/sdk-app-example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java @@ -54,11 +54,11 @@ public void beforeNotify(Report report) { assertNotNull(report); JSONObject json = getJson(report); - assertEquals(3, json.length()); + assertEquals(4, json.length()); JSONObject event = json.getJSONArray("events").getJSONObject(0); assertNotNull(event); - assertEquals("com.bugsnag.android.example.ExampleActivity", event.getString("context")); + assertEquals("ExampleActivity", event.getString("context")); JSONArray exceptions = event.getJSONArray("exceptions"); assertEquals(1, exceptions.length()); diff --git a/example/src/javaExample/java/com/bugsnag/android/example/ExampleActivity.java b/examples/sdk-app-example/src/javaExample/java/com/bugsnag/android/example/ExampleActivity.java similarity index 100% rename from example/src/javaExample/java/com/bugsnag/android/example/ExampleActivity.java rename to examples/sdk-app-example/src/javaExample/java/com/bugsnag/android/example/ExampleActivity.java diff --git a/example/src/javaExample/java/com/bugsnag/android/example/ExampleApplication.java b/examples/sdk-app-example/src/javaExample/java/com/bugsnag/android/example/ExampleApplication.java similarity index 100% rename from example/src/javaExample/java/com/bugsnag/android/example/ExampleApplication.java rename to examples/sdk-app-example/src/javaExample/java/com/bugsnag/android/example/ExampleApplication.java diff --git a/example/src/javaExample/java/com/bugsnag/android/other/CrashyClass.java b/examples/sdk-app-example/src/javaExample/java/com/bugsnag/android/other/CrashyClass.java similarity index 100% rename from example/src/javaExample/java/com/bugsnag/android/other/CrashyClass.java rename to examples/sdk-app-example/src/javaExample/java/com/bugsnag/android/other/CrashyClass.java diff --git a/example/src/kotlinExample/java/com.bugsnag.android/example/ExampleActivity.kt b/examples/sdk-app-example/src/kotlinExample/java/com.bugsnag.android/example/ExampleActivity.kt similarity index 100% rename from example/src/kotlinExample/java/com.bugsnag.android/example/ExampleActivity.kt rename to examples/sdk-app-example/src/kotlinExample/java/com.bugsnag.android/example/ExampleActivity.kt diff --git a/example/src/kotlinExample/java/com.bugsnag.android/example/ExampleApplication.kt b/examples/sdk-app-example/src/kotlinExample/java/com.bugsnag.android/example/ExampleApplication.kt similarity index 100% rename from example/src/kotlinExample/java/com.bugsnag.android/example/ExampleApplication.kt rename to examples/sdk-app-example/src/kotlinExample/java/com.bugsnag.android/example/ExampleApplication.kt diff --git a/example/src/kotlinExample/java/com.bugsnag.android/other/CrashyClass.kt b/examples/sdk-app-example/src/kotlinExample/java/com.bugsnag.android/other/CrashyClass.kt similarity index 100% rename from example/src/kotlinExample/java/com.bugsnag.android/other/CrashyClass.kt rename to examples/sdk-app-example/src/kotlinExample/java/com.bugsnag.android/other/CrashyClass.kt diff --git a/example/src/main/AndroidManifest.xml b/examples/sdk-app-example/src/main/AndroidManifest.xml similarity index 100% rename from example/src/main/AndroidManifest.xml rename to examples/sdk-app-example/src/main/AndroidManifest.xml diff --git a/example/src/main/ic_launcher-web.png b/examples/sdk-app-example/src/main/ic_launcher-web.png similarity index 100% rename from example/src/main/ic_launcher-web.png rename to examples/sdk-app-example/src/main/ic_launcher-web.png diff --git a/example/src/main/res/drawable/ic_bugsnag_svg.xml b/examples/sdk-app-example/src/main/res/drawable/ic_bugsnag_svg.xml similarity index 100% rename from example/src/main/res/drawable/ic_bugsnag_svg.xml rename to examples/sdk-app-example/src/main/res/drawable/ic_bugsnag_svg.xml diff --git a/example/src/main/res/layout/main.xml b/examples/sdk-app-example/src/main/res/layout/main.xml similarity index 100% rename from example/src/main/res/layout/main.xml rename to examples/sdk-app-example/src/main/res/layout/main.xml diff --git a/example/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/sdk-app-example/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from example/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to examples/sdk-app-example/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/example/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/sdk-app-example/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from example/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to examples/sdk-app-example/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/example/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/sdk-app-example/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_launcher.png rename to examples/sdk-app-example/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/example/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/examples/sdk-app-example/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to examples/sdk-app-example/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/example/src/main/res/mipmap-hdpi/ic_launcher_round.png b/examples/sdk-app-example/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to examples/sdk-app-example/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/example/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/sdk-app-example/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from example/src/main/res/mipmap-mdpi/ic_launcher.png rename to examples/sdk-app-example/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/example/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/examples/sdk-app-example/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from example/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to examples/sdk-app-example/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/example/src/main/res/mipmap-mdpi/ic_launcher_round.png b/examples/sdk-app-example/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from example/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to examples/sdk-app-example/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/example/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/sdk-app-example/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_launcher.png rename to examples/sdk-app-example/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/example/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/examples/sdk-app-example/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to examples/sdk-app-example/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/example/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/examples/sdk-app-example/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to examples/sdk-app-example/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/example/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/sdk-app-example/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from example/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to examples/sdk-app-example/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/example/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/examples/sdk-app-example/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from example/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to examples/sdk-app-example/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/example/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/examples/sdk-app-example/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from example/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to examples/sdk-app-example/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/example/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/examples/sdk-app-example/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from example/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to examples/sdk-app-example/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/example/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/examples/sdk-app-example/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from example/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to examples/sdk-app-example/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/examples/sdk-app-example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to examples/sdk-app-example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/example/src/main/res/values-fr/strings.xml b/examples/sdk-app-example/src/main/res/values-fr/strings.xml similarity index 100% rename from example/src/main/res/values-fr/strings.xml rename to examples/sdk-app-example/src/main/res/values-fr/strings.xml diff --git a/example/src/main/res/values/colors.xml b/examples/sdk-app-example/src/main/res/values/colors.xml similarity index 100% rename from example/src/main/res/values/colors.xml rename to examples/sdk-app-example/src/main/res/values/colors.xml diff --git a/example/src/main/res/values/ic_launcher_background.xml b/examples/sdk-app-example/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from example/src/main/res/values/ic_launcher_background.xml rename to examples/sdk-app-example/src/main/res/values/ic_launcher_background.xml diff --git a/example/src/main/res/values/strings.xml b/examples/sdk-app-example/src/main/res/values/strings.xml similarity index 100% rename from example/src/main/res/values/strings.xml rename to examples/sdk-app-example/src/main/res/values/strings.xml diff --git a/example/src/main/res/values/styles.xml b/examples/sdk-app-example/src/main/res/values/styles.xml similarity index 100% rename from example/src/main/res/values/styles.xml rename to examples/sdk-app-example/src/main/res/values/styles.xml diff --git a/examplelib/.gitignore b/examples/sdk-lib-example/.gitignore similarity index 100% rename from examplelib/.gitignore rename to examples/sdk-lib-example/.gitignore diff --git a/examplelib/build.gradle b/examples/sdk-lib-example/build.gradle similarity index 66% rename from examplelib/build.gradle rename to examples/sdk-lib-example/build.gradle index 24e8275ae4..6140da3fd9 100644 --- a/examplelib/build.gradle +++ b/examples/sdk-lib-example/build.gradle @@ -7,16 +7,17 @@ buildscript { jcenter() } dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.1.0' } } android { - compileSdkVersion Integer.parseInt(project.ANDROID_COMPILE_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + compileSdkVersion 27 + buildToolsVersion "27.0.0" defaultConfig { - minSdkVersion Integer.parseInt(project.ANDROID_MIN_SDK_VERSION) + minSdkVersion 14 } buildTypes { @@ -28,4 +29,4 @@ android { } apply plugin: 'com.bugsnag.android.gradle' -apply from: "../checkstyle.gradle" +apply from: "../../checkstyle.gradle" diff --git a/examplelib/proguard-rules.pro b/examples/sdk-lib-example/proguard-rules.pro similarity index 100% rename from examplelib/proguard-rules.pro rename to examples/sdk-lib-example/proguard-rules.pro diff --git a/examplelib/src/main/AndroidManifest.xml b/examples/sdk-lib-example/src/main/AndroidManifest.xml similarity index 100% rename from examplelib/src/main/AndroidManifest.xml rename to examples/sdk-lib-example/src/main/AndroidManifest.xml diff --git a/examplelib/src/main/res/values/strings.xml b/examples/sdk-lib-example/src/main/res/values/strings.xml similarity index 100% rename from examplelib/src/main/res/values/strings.xml rename to examples/sdk-lib-example/src/main/res/values/strings.xml