Merge e0cea5b into 947f096

build.gradle

@@ -4,10 +4,11 @@ buildscript {
         mavenCentral()
         jcenter()
     }
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.3.10'
+    ext.agpVersion = "3.2.1"
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath "com.android.tools.build:gradle:$agpVersion"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'

examples/sdk-app-example/build.gradle

@@ -4,9 +4,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "com.android.tools.build:gradle:$agpVersion"
         classpath 'com.bugsnag:bugsnag-android-gradle-plugin:3.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.30"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -78,7 +78,7 @@ dependencies {
     // api project(path: ':ndk', configuration: 'default')
     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"
+    kotlinExampleImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     androidTestImplementation "com.android.support.test:runner:0.5", {
         exclude group: 'com.android.support', module: 'support-annotations'
     }

features/fixtures/mazerunner/build.gradle

@@ -12,7 +12,7 @@ buildscript {
         google()
         jcenter()
     }
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.3.10'
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -66,7 +66,7 @@ android {
 dependencies {
     implementation(name:'bugsnag-android', ext:'aar')
     implementation(name:'bugsnag-android-ndk', ext:'aar')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.21"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "com.facebook.infer.annotation:infer-annotation:0.11.2"
     api "com.android.support:support-annotations:27.0.0"
 }

sdk/build.gradle

@@ -30,6 +30,7 @@ android {
         abortOnError true
         warningsAsErrors true
         checkAllWarnings true
+        baseline file("lint-baseline.xml")
     }
 
     // TODO replace with https://issuetracker.google.com/issues/72050365 once released.
@@ -50,7 +51,7 @@ coveralls {
 dependencies {
     api "com.android.support:support-annotations:$supportLibVersion"
 
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"

sdk/src/main/java/com/bugsnag/android/Client.java

@@ -71,7 +71,7 @@ public class Client extends Observable implements Observer {
 
     final SessionStore sessionStore;
 
-    private final EventReceiver eventReceiver;
+    final EventReceiver eventReceiver;
     final SessionTracker sessionTracker;
     SharedPreferences sharedPrefs;
 
@@ -230,7 +230,7 @@ public void onOrientationChanged(int orientation) {
         errorStore.flushOnLaunch();
     }
 
-    private class ConnectivityChangeReceiver extends BroadcastReceiver {
+    class ConnectivityChangeReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             ConnectivityManager cm =
@@ -263,7 +263,7 @@ public void run() {
         }
     }
 
-    private void enqueuePendingNativeReports() {
+    void enqueuePendingNativeReports() {
         setChanged();
         notifyObservers(new Message(
             NativeInterface.MessageType.DELIVER_PENDING, null));

sdk/src/main/java/com/bugsnag/android/ErrorStore.java

@@ -26,7 +26,7 @@ class ErrorStore extends FileStore<Error> {
     private static final long LAUNCH_CRASH_TIMEOUT_MS = 2000;
     private static final int LAUNCH_CRASH_POLL_MS = 50;
 
-    private volatile boolean flushOnLaunchCompleted = false;
+    volatile boolean flushOnLaunchCompleted = false;
     private final Semaphore semaphore = new Semaphore(1);
 
     static final Comparator<File> ERROR_REPORT_COMPARATOR = new Comparator<File>() {
@@ -116,7 +116,7 @@ public void run() {
         }
     }
 
-    private void flushReports(Collection<File> storedReports) {
+    void flushReports(Collection<File> storedReports) {
         if (!storedReports.isEmpty() && semaphore.tryAcquire(1)) {
             try {
                 Logger.info(String.format(Locale.US,

sdk/src/main/java/com/bugsnag/android/SessionTracker.java

@@ -30,10 +30,11 @@ class SessionTracker extends Observable implements Application.ActivityLifecycle
 
     private final Collection<String>
         foregroundActivities = new ConcurrentLinkedQueue<>();
-    private final Configuration configuration;
     private final long timeoutMs;
-    private final Client client;
-    private final SessionStore sessionStore;
+
+    final Configuration configuration;
+    final Client client;
+    final SessionStore sessionStore;
 
     // This most recent time an Activity was stopped.
     private AtomicLong activityLastStoppedAtMs = new AtomicLong(0);