Merge pull request #26 from stanwood/feaature/mastermerge

Feaature/mastermerge
stanwood · Mar 6, 2019 · 0bf386c · 0bf386c
2 parents 19fbdbb + 995f8ef
commit 0bf386c
Show file tree

Hide file tree

Showing 70 changed files with 328 additions and 464 deletions.
diff --git a/adjusttrackingprovider-noop/build.gradle b/adjusttrackingprovider-noop/build.gradle
@@ -1,21 +1,21 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.stanwood.Analytics_Framework_android'
-version = project.ext.FrameworkVersion
+version = FrameworkVersion
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
-        versionName project.ext.FrameworkVersion
+        versionName FrameworkVersion
     }
 }
 
 dependencies {
     api project(':core')
-    implementation "com.android.support:support-annotations:$rootProject.ext.SupportLibVersion"
+    implementation "androidx.annotation:annotation:$AnnotationVersion"
     api project(':adjusttrackingprovider-shared')
 }
 

diff --git a/adjusttrackingprovider-shared/build.gradle b/adjusttrackingprovider-shared/build.gradle
@@ -1,21 +1,21 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.stanwood.Analytics_Framework_android'
-version = project.ext.FrameworkVersion
+version = FrameworkVersion
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
-        versionName project.ext.FrameworkVersion
+        versionName FrameworkVersion
     }
 }
 
 dependencies {
     api project(':core')
-    implementation "com.android.support:support-annotations:$rootProject.ext.SupportLibVersion"
+    implementation "androidx.annotation:annotation:$AnnotationVersion"
 }
 
 // build a jar with source files

diff --git a/...ngprovider-shared/src/main/java/io/stanwood/framework/analytics/adjust/AdjustTracker.java b/...ngprovider-shared/src/main/java/io/stanwood/framework/analytics/adjust/AdjustTracker.java
@@ -2,8 +2,8 @@
 
 
 import android.app.Application;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import io.stanwood.framework.analytics.generic.Tracker;
 import io.stanwood.framework.analytics.generic.TrackerParams;
 
@@ -16,13 +16,12 @@ protected AdjustTracker(Builder builder) {
         super(builder);
         this.appKey = builder.appKey;
         if (builder.mapFunc == null) {
-            mapFunc = new DefaultMapFunction();
+            mapFunc = new MapFunction();
         } else {
             mapFunc = builder.mapFunc;
         }
     }
 
-
     @Override
     public void track(@NonNull TrackerParams params) {
         //noop
@@ -43,6 +42,13 @@ protected void enable(boolean enabled) {
         //noop
     }
 
+    public static class MapFunction {
+
+        public String mapContentToken(TrackerParams params) {
+            return null;
+        }
+    }
+
     public abstract static class Builder extends Tracker.Builder<Builder> {
         private String appKey;
         private MapFunction mapFunc = null;

diff --git a/...vider-shared/src/main/java/io/stanwood/framework/analytics/adjust/DefaultMapFunction.java b/...vider-shared/src/main/java/io/stanwood/framework/analytics/adjust/DefaultMapFunction.java
diff --git a/...kingprovider-shared/src/main/java/io/stanwood/framework/analytics/adjust/MapFunction.java b/...kingprovider-shared/src/main/java/io/stanwood/framework/analytics/adjust/MapFunction.java
diff --git a/adjusttrackingprovider/build.gradle b/adjusttrackingprovider/build.gradle
@@ -1,23 +1,23 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.stanwood.Analytics_Framework_android'
-version = project.ext.FrameworkVersion
+version = FrameworkVersion
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
-        versionName project.ext.FrameworkVersion
+        versionName FrameworkVersion
         consumerProguardFiles 'proguard-rules.pro'
     }
 }
 
 dependencies {
     implementation project(':core')
-    implementation "com.android.support:support-annotations:$rootProject.ext.SupportLibVersion"
-    implementation "com.google.android.gms:play-services-analytics:$rootProject.ext.PlayServicesAnalyticsVersion"
+    implementation "androidx.annotation:annotation:$AnnotationVersion"
+    implementation "com.google.android.gms:play-services-analytics:$PlayServicesAnalyticsVersion"
     implementation 'com.adjust.sdk:adjust-android:4.17.0'
     implementation 'com.android.installreferrer:installreferrer:1.0'
     api project(':adjusttrackingprovider-shared')

diff --git a/...ckingprovider/src/main/java/io/stanwood/framework/analytics/adjust/AdjustTrackerImpl.java b/...ckingprovider/src/main/java/io/stanwood/framework/analytics/adjust/AdjustTrackerImpl.java
@@ -2,7 +2,7 @@
 
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.adjust.sdk.Adjust;

diff --git a/app/build.gradle b/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
 
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -45,8 +45,8 @@ dependencies {
     releaseImplementation project(':mixpaneltrackingprovider')
     debugImplementation project(':adjusttrackingprovider-noop')
     releaseImplementation project(':adjusttrackingprovider')
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.SupportLibVersion"
-    implementation "com.google.firebase:firebase-perf:$rootProject.ext.FirebasePerfVersion"
+    implementation "androidx.appcompat:appcompat:$AppCompatVersion"
+    implementation "com.google.firebase:firebase-perf:16.2.3"
 
     implementation("com.google.firebase:firebase-analytics:16.0.3")
     implementation("com.google.firebase:firebase-analytics-impl:16.2.1")

diff --git a/app/src/main/java/io/stanwood/analyticstest/analytics/AdvancedAppTracker.java b/app/src/main/java/io/stanwood/analyticstest/analytics/AdvancedAppTracker.java
@@ -2,25 +2,26 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.firebase.perf.FirebasePerformance;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import io.stanwood.framework.analytics.BaseAnalyticsTracker;
+import io.stanwood.framework.analytics.adjust.AdjustTracker;
 import io.stanwood.framework.analytics.adjust.AdjustTrackerImpl;
 import io.stanwood.framework.analytics.fabric.FabricTracker;
 import io.stanwood.framework.analytics.fabric.FabricTrackerImpl;
-import io.stanwood.framework.analytics.firebase.DefaultMapFunction;
 import io.stanwood.framework.analytics.firebase.FirebaseTracker;
 import io.stanwood.framework.analytics.firebase.FirebaseTrackerImpl;
 import io.stanwood.framework.analytics.ga.GoogleAnalyticsTrackerImpl;
 import io.stanwood.framework.analytics.generic.Tracker;
 import io.stanwood.framework.analytics.generic.TrackerParams;
 import io.stanwood.framework.analytics.generic.TrackingEvent;
+import io.stanwood.framework.analytics.mixpanel.MixpanelTracker;
 import io.stanwood.framework.analytics.mixpanel.MixpanelTrackerImpl;
 import timber.log.Timber;
 
@@ -38,14 +39,14 @@ private AdvancedAppTracker(@NonNull Context context, @NonNull FabricTracker fabr
     public static synchronized void init(Application application) {
         if (instance == null) {
             FirebaseTracker firebaseTracker = FirebaseTrackerImpl.builder(application)
-                    .mapFunction(new DefaultMapFunction() {
+                    .mapFunction(new FirebaseTracker.MapFunction() {
                         @Override
                         public TrackerParams map(TrackerParams params) {
                             return params.newBuilder("fbevent").build();
                         }
                     }).build();
             Tracker adjustTracker = AdjustTrackerImpl.builder(application, "KEY")
-                    .mapFunction(new io.stanwood.framework.analytics.adjust.DefaultMapFunction() {
+                    .mapFunction(new AdjustTracker.MapFunction() {
                         @Override
                         public String mapContentToken(TrackerParams params) {
                             if (TrackingEvent.SCREEN_VIEW.equalsIgnoreCase(params.getEventName()) && params.getName().equals("home")) {
@@ -56,7 +57,7 @@ public String mapContentToken(TrackerParams params) {
                     })
                     .build();
             Tracker mixpanelTracker = MixpanelTrackerImpl.builder(application, "KEY")
-                    .mapFunction(new io.stanwood.framework.analytics.mixpanel.DefaultMapFunction() {
+                    .mapFunction(new MixpanelTracker.MapFunction() {
                         @Override
                         public TrackerParams map(TrackerParams params) {
                             return TrackerParams.builder(params.getEventName())

diff --git a/app/src/main/java/io/stanwood/analyticstest/analytics/MainActivity.java b/app/src/main/java/io/stanwood/analyticstest/analytics/MainActivity.java
@@ -1,8 +1,9 @@
 package io.stanwood.analyticstest.analytics;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
+
+import androidx.appcompat.app.AppCompatActivity;
 import io.stanwood.framework.analytics.fabric.FabricTrackerImpl;
 import io.stanwood.framework.analytics.firebase.FirebaseTrackerImpl;
 import timber.log.Timber;

diff --git a/app/src/main/java/io/stanwood/analyticstest/analytics/SimpleAppTracker.java b/app/src/main/java/io/stanwood/analyticstest/analytics/SimpleAppTracker.java
@@ -2,8 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.firebase.perf.FirebasePerformance;
 

diff --git a/bugfendertrackingprovider-noop/build.gradle b/bugfendertrackingprovider-noop/build.gradle
@@ -1,22 +1,22 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.stanwood.Analytics_Framework_android'
-version = project.ext.FrameworkVersion
+version = FrameworkVersion
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
-        versionName project.ext.FrameworkVersion
+        versionName FrameworkVersion
     }
 
 }
 
 dependencies {
     implementation project(':core')
-    implementation "com.android.support:support-annotations:$rootProject.ext.SupportLibVersion"
+    implementation "androidx.annotation:annotation:$AnnotationVersion"
     api project(':bugfendertrackingprovider-shared')
 }
 

diff --git a/bugfendertrackingprovider-shared/build.gradle b/bugfendertrackingprovider-shared/build.gradle
@@ -1,21 +1,21 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.stanwood.Analytics_Framework_android'
-version = project.ext.FrameworkVersion
+version = FrameworkVersion
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
-        versionName project.ext.FrameworkVersion
+        versionName FrameworkVersion
     }
 }
 
 dependencies {
     implementation project(':core')
-    implementation "com.android.support:support-annotations:$rootProject.ext.SupportLibVersion"
+    implementation "androidx.annotation:annotation:$AnnotationVersion"
 }
 
 // build a jar with source files

diff --git a/...ider-shared/src/main/java/io/stanwood/framework/analytics/bugfender/BugfenderTracker.java b/...ider-shared/src/main/java/io/stanwood/framework/analytics/bugfender/BugfenderTracker.java
@@ -2,7 +2,7 @@
 
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import io.stanwood.framework.analytics.generic.Tracker;
 import io.stanwood.framework.analytics.generic.TrackerParams;

diff --git a/bugfendertrackingprovider/build.gradle b/bugfendertrackingprovider/build.gradle
@@ -1,22 +1,22 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.stanwood.Analytics_Framework_android'
-version = project.ext.FrameworkVersion
+version = FrameworkVersion
 android {
-    compileSdkVersion project.ext.CompileSdkVersion
+    compileSdkVersion CompileSdkVersion
 
     defaultConfig {
-        minSdkVersion project.ext.MinSdkVersion
-        targetSdkVersion project.ext.TargetSdkVersion
+        minSdkVersion MinSdkVersion
+        targetSdkVersion TargetSdkVersion
         versionCode 1
-        versionName project.ext.FrameworkVersion
+        versionName FrameworkVersion
         consumerProguardFiles 'proguard-rules.pro'
     }
 }
 
 dependencies {
     implementation project(':core')
-    implementation "com.android.support:support-annotations:$rootProject.ext.SupportLibVersion"
+    implementation "androidx.annotation:annotation:$AnnotationVersion"
     api 'com.bugfender.sdk:android:1.0'
     api project(':bugfendertrackingprovider-shared')
 }

diff --git a/...rovider/src/main/java/io/stanwood/framework/analytics/bugfender/BugfenderTrackerImpl.java b/...rovider/src/main/java/io/stanwood/framework/analytics/bugfender/BugfenderTrackerImpl.java
@@ -2,8 +2,8 @@
 
 
 import android.app.Application;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
 
 import com.bugfender.sdk.Bugfender;