Move example projects into a subdirectory

.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
 

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

example/build.gradle → 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()

example/src/androidTest/java/com/bugsnag/android/CrashReportTest.java → 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());

examplelib/build.gradle → 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"