Merge branch 'release/1.6.0'

snowplow · Sep 2, 2020 · 5a8b982 · 5a8b982
2 parents 74b982e + a8f14bb
commit 5a8b982
Show file tree

Hide file tree

Showing 24 changed files with 1,876 additions and 1,148 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,9 @@
 
+Version 1.6.0 (2020-09-01)
+--------------------------
+Emitter refactoring (#409)
+Report logs to the app (#407)
+
 Version 1.5.0 (2020-07-02)
 --------------------------
 Deprecate onlyTrackLabelledScreens option (#401)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.0
+1.6.0
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '1.5.0'
+    version = '1.6.0'
     repositories {
         google()
         maven {

diff --git a/snowplow-demo-app/src/main/java/com/snowplowanalytics/snowplowtrackerdemo/Demo.java b/snowplow-demo-app/src/main/java/com/snowplowanalytics/snowplowtrackerdemo/Demo.java
@@ -27,6 +27,7 @@
 
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
+import android.util.Log;
 import android.widget.EditText;
 import android.widget.Button;
 import android.view.View;
@@ -39,6 +40,7 @@
 
 import com.snowplowanalytics.snowplow.tracker.DevicePlatforms;
 import com.snowplowanalytics.snowplow.tracker.Gdpr;
+import com.snowplowanalytics.snowplow.tracker.LoggerDelegate;
 import com.snowplowanalytics.snowplow.tracker.Subject;
 import com.snowplowanalytics.snowplow.tracker.constants.Parameters;
 import com.snowplowanalytics.snowplow.tracker.constants.TrackerConstants;
@@ -64,7 +66,7 @@
  * Classic Demo Activity.
  */
 @SuppressWarnings("FieldCanBeLocal")
-public class Demo extends Activity {
+public class Demo extends Activity implements LoggerDelegate {
 
     private Button _startButton, _tabButton;
     private EditText _uriField;
@@ -353,6 +355,7 @@ private void initAndroidTracker() {
 
         Tracker.init(new Tracker.TrackerBuilder(emitter, namespace, appId, this.getApplicationContext())
                 .level(LogLevel.VERBOSE)
+                .loggerDelegate(this)
                 .base64(false)
                 .platform(DevicePlatforms.Mobile)
                 .subject(subject)
@@ -399,4 +402,21 @@ public void onFailure(int successCount, int failureCount) {
             }
         };
     }
+
+    /// - Implements LoggerDelegate
+
+    @Override
+    public void error(String tag, String msg) {
+        Log.e("[" + tag + "]", msg);
+    }
+
+    @Override
+    public void debug(String tag, String msg) {
+        Log.d("[" + tag + "]", msg);
+    }
+
+    @Override
+    public void verbose(String tag, String msg) {
+        Log.v("[" + tag + "]", msg);
+    }
 }
diff --git a/snowplow-tracker/build.gradle b/snowplow-tracker/build.gradle
@@ -79,10 +79,10 @@ dependencies {
     implementation 'com.android.support:support-annotations:28.0.0'
     implementation "android.arch.lifecycle:extensions:$project.archLifecycleVersion"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.squareup.okhttp3:okhttp:3.4.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     // test
     androidTestImplementation 'com.google.android.gms:play-services-analytics:16.0.1'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.4.1'
+    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.12'
 }
 
 android.libraryVariants.all { variant ->