Merge 0c93b06 into 5c52820

snowplow · Jun 10, 2019 · aad9bc8 · aad9bc8
2 parents 5c52820 + 0c93b06
commit aad9bc8
Show file tree

Hide file tree

Showing 18 changed files with 1,019 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,18 @@
-sudo: required
+# use the Travis Container-Based Infrastructure
+sudo: false
+
 language: android
 jdk: oraclejdk8
 
+cache: false
+dist: trusty
+
 env:
   global:
-    - EMULATOR_API=22
+    - EMULATOR_API=24
     - ANDROID_API=28
     - ANDROID_BUILD_TOOLS=28.0.3
+    - ADB_INSTALL_TIMEOUT=20
     - ANDROID_TRAVIS=1
     - secure: iXVs65+lPjyTr60MsX9K2WpjJ5ijt4cnBE9PT6ouHSjkZjugotaNoX3nXZev8fKFLsH0JPxpsxBVy66jz6iOddMfLdzSiL2oOeeYNxyNThOdGp9R/JmYtivgrMm6v3e1zzCLvj9onOwBUVdWVLD/BXgYi7wP96rJFENlVjuszys=
     - secure: BXwZhWDFFXzdaTAPAvMKeOfnLHxkmdXoeMZ/GtVYkT62JxeuiaTW6Z6rT0gZKAEyxmUBxFX1CP+1m1Gi0cWrQHfTBbFDJO7iKu7mG9LcZhQ8Cm657yt2TBc+fnVqbG5OxXWhSBs1lF1gZJ6+ehEIJn3YjP6fDYv0fNnTGpYHCYo=
@@ -26,24 +32,37 @@ android:
     - addon-google_apis-google-$ANDROID_API # google play services
     - sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_API
     - sys-img-armeabi-v7a-android-$EMULATOR_API # the fix!
-
-  licenses:
-    - ".+"
-  before_install:
-    - yes | sdkmanager "platforms;android-28"
+
+licenses:
+  - android-sdk-license-.+
+  - '.+'
+
+before_install: echo 'count=0' > /home/travis/.android/repositories.cfg
+
+install:
+  - sdkmanager --list --verbose || true
+  - yes | sdkmanager "tools"
+  - yes | sdkmanager "platform-tools"
+  - yes | sdkmanager "build-tools;"$ANDROID_BUILD_TOOLS
+  - yes | sdkmanager "platforms;android-"$ANDROID_API
+  - yes | sdkmanager "emulator"
+  - yes | sdkmanager "extras;android;m2repository"
+  - yes | sdkmanager "extras;google;m2repository"
+  - yes | sdkmanager --update
+  - yes | sdkmanager --licenses
+  - sdkmanager --list --verbose || true
 
 before_script:
-  - echo "y" | android update sdk -a --no-ui --filter android-28
-  - echo "y" | android update sdk -a --no-ui --filter sys-img-armeabi-v7a-android-28
-  - android list targets | grep -E '^id:' | awk -F '"' '{$1=""; print $2}' # list all targets
-  - echo no | android create avd --force -n test -t android-$EMULATOR_API --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - chmod +x ./ci/wait_for_emulator
-  - ./ci/wait_for_emulator
+  - export PATH="$ANDROID_HOME/emulator:$PATH"
+  - sdkmanager "system-images;android-"$EMULATOR_API";default;armeabi-v7a"
+  - echo no | avdmanager -v create avd -f -n test -k "system-images;android-"$EMULATOR_API";default;armeabi-v7a"
+  - avdmanager list
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
   - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew createDebugCoverageReport coveralls
+  - travis_wait 45 ./gradlew createDebugCoverageReport coveralls
 
 deploy:
   skip_cleanup: true

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
@@ -29,11 +29,15 @@
 
 import com.snowplowanalytics.snowplow.tracker.DevicePlatforms;
 import com.snowplowanalytics.snowplow.tracker.Subject;
+import com.snowplowanalytics.snowplow.tracker.contexts.global.GlobalContext;
+import com.snowplowanalytics.snowplow.tracker.contexts.global.RuleSet;
+import com.snowplowanalytics.snowplow.tracker.contexts.global.RuleSetProvider;
 import com.snowplowanalytics.snowplow.tracker.emitter.HttpMethod;
 import com.snowplowanalytics.snowplow.tracker.emitter.RequestCallback;
 import com.snowplowanalytics.snowplow.tracker.emitter.RequestSecurity;
 import com.snowplowanalytics.snowplow.tracker.Tracker;
 import com.snowplowanalytics.snowplow.tracker.Emitter;
+import com.snowplowanalytics.snowplow.tracker.tracker.InstallTracker;
 import com.snowplowanalytics.snowplow.tracker.utils.LogLevel;
 import com.snowplowanalytics.snowplow.tracker.utils.Util;
 import com.snowplowanalytics.snowplowtrackerdemo.utils.DemoUtils;
@@ -300,9 +304,34 @@ private void initAndroidTracker() {
                 .screenviewEvents(true)
                 .screenContext(true)
                 .installTracking(true)
-                .applicationContext(true)
+                .applicationContext(false) // we'll send it as a global context
                 .build()
         );
+
+//        GlobalContext appContext = new ContextGenerator() {
+//            @Override
+//            public SelfDescribingJson generate(TrackerPayload payload, String eventType, String eventSchema) {
+//                return InstallTracker.getApplicationContext(Demo.this);
+//            }
+//        };
+
+//        GlobalContext appContext = new FilterProvider(
+//                new ContextFilter() {
+//                    @Override
+//                    public boolean filter(TrackerPayload payload) {
+//                        return true;
+//                    }
+//                },
+//                InstallTracker.getApplicationContext(Demo.this)
+//        );
+
+        GlobalContext appContext = new RuleSetProvider(
+                "appContext",
+                new RuleSet("iglu:com.snowplowanalytics.*/*/jsonschema/*-*-*", null),
+                InstallTracker.getApplicationContext(Demo.this)
+        );
+
+        Tracker.instance().addGlobalContext(appContext);
     }
 
     /**

diff --git a/snowplow-tracker/build.gradle b/snowplow-tracker/build.gradle
@@ -64,6 +64,8 @@ dependencies {
     implementation "android.arch.lifecycle:extensions:$project.archLifecycleVersion"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.squareup.okhttp3:okhttp:3.4.1'
+    implementation 'com.cedarsoftware:java-util:1.34.0'
+    annotationProcessor 'org.apache.logging.log4j:log4j-core:2.5'
     androidTestImplementation 'com.google.android.gms:play-services-analytics:16.0.1'
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.4.1'
 }