Merge branch 'release/5.4.3'

snowplow · Aug 31, 2023 · 78dca5a · 78dca5a
2 parents df8a726 + 4b5b2db
commit 78dca5a
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 23 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,13 @@
+Version 5.4.3 (2023-08-25)
+--------------------------
+Fix network type is tracked instead of network technology when filtering mobile context parameters (#635)
+Upgrade com.google.android.gms:play-services-analytics from 18.0.2 to 18.0.3
+Upgrade com.android.tools:desugar_jdk_libs from 1.1.5 to 1.1.9
+Upgrade androidx.preference:preference from 1.2.0 to 1.2.1
+Upgrade androidx.core:core-ktx from 1.9.0 to 1.10.1
+Upgrade demo app dependencies
+Set signing config for demo apps
+
 Version 5.4.2 (2023-08-08)
 --------------------------
 Update vendor and version of the player schema used in media tracking (#632)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.4.2
+5.4.3
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ plugins {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '5.4.2'
+    version = '5.4.3'
     repositories {
         google()
         maven {

diff --git a/gradle.properties b/gradle.properties
@@ -31,7 +31,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 SONATYPE_STAGING_PROFILE=comsnowplowanalytics
 GROUP=com.snowplowanalytics
 POM_ARTIFACT_ID=snowplow-android-tracker
-VERSION_NAME=5.4.2
+VERSION_NAME=5.4.3
 
 POM_NAME=snowplow-android-tracker
 POM_PACKAGING=aar

diff --git a/snowplow-demo-compose/build.gradle b/snowplow-demo-compose/build.gradle
@@ -15,6 +15,7 @@ android {
         versionName '1.0'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        signingConfig signingConfigs.debug
     }
 
     buildTypes {
@@ -48,14 +49,14 @@ dependencies {
     implementation 'androidx.compose.material:material'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     debugImplementation 'androidx.compose.ui:ui-tooling'
-    implementation 'androidx.activity:activity-compose:1.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
-    implementation "androidx.navigation:navigation-compose:2.5.3"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
+    implementation "androidx.navigation:navigation-compose:2.6.0"
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.browser:browser:1.5.0'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':snowplow-android-tracker')

diff --git a/snowplow-demo-java/build.gradle b/snowplow-demo-java/build.gradle
@@ -14,6 +14,7 @@ android {
         targetSdkVersion 31
         versionCode 3
         versionName "0.3.0"
+        signingConfig signingConfigs.debug
     }
 
     buildTypes {
@@ -52,5 +53,5 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.google.code.gson:gson:2.9.0'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.9'
 }
diff --git a/snowplow-demo-kotlin/build.gradle b/snowplow-demo-kotlin/build.gradle
@@ -15,6 +15,7 @@ android {
         versionName '1.0'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        signingConfig signingConfigs.debug
     }
 
     buildTypes {
@@ -33,12 +34,12 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':snowplow-android-tracker')
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.browser:browser:1.5.0'
     implementation 'com.google.android.gms:play-services-appset:16.0.2'
     implementation "com.android.installreferrer:installreferrer:2.2"

diff --git a/snowplow-tracker/build.gradle b/snowplow-tracker/build.gradle
@@ -87,12 +87,12 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.preference:preference:1.2.1'
     compileOnly "androidx.lifecycle:lifecycle-extensions:$project.archLifecycleVersion"
     compileOnly "com.android.installreferrer:installreferrer:2.2"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.9'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
@@ -102,7 +102,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'com.google.android.gms:play-services-analytics:18.0.2'
+    androidTestImplementation 'com.google.android.gms:play-services-analytics:18.0.3'
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.7.2'
 }
 

diff --git a/...c/androidTest/java/com/snowplowanalytics/snowplow/internal/tracker/PlatformContextTest.kt b/...c/androidTest/java/com/snowplowanalytics/snowplow/internal/tracker/PlatformContextTest.kt
@@ -265,6 +265,19 @@ class PlatformContextTest {
         Locale.setDefault(defaultLocale)        
     }
 
+    @Test
+    fun doesntSetTheNetworkTechIfNotRequested() {
+        val platformContext = PlatformContext(listOf(
+            PlatformContextProperty.NETWORK_TYPE
+        ), context)
+        val sdj = platformContext.getMobileContext(false)
+        Assert.assertNotNull(sdj)
+        val sdjData = sdj!!.map["data"] as Map<*, *>
+
+        Assert.assertTrue(sdjData.containsKey(Parameters.NETWORK_TYPE))
+        Assert.assertFalse(sdjData.containsKey(Parameters.NETWORK_TECHNOLOGY))
+    }
+
     // --- PRIVATE
     private val context: Context
         get() = InstrumentationRegistry.getInstrumentation().targetContext

diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/core/tracker/PlatformContext.kt b/snowplow-tracker/src/main/java/com/snowplowanalytics/core/tracker/PlatformContext.kt
@@ -186,15 +186,15 @@ class PlatformContext(
         val networkInfo = deviceInfoMonitor.getNetworkInfo(context)
         if (trackType) {
             addToMap(
-                Parameters.NETWORK_TECHNOLOGY,
-                deviceInfoMonitor.getNetworkTechnology(networkInfo),
+                Parameters.NETWORK_TYPE,
+                deviceInfoMonitor.getNetworkType(networkInfo),
                 pairs
             )
         }
         if (trackTech) {
             addToMap(
-                Parameters.NETWORK_TYPE,
-                deviceInfoMonitor.getNetworkType(networkInfo),
+                Parameters.NETWORK_TECHNOLOGY,
+                deviceInfoMonitor.getNetworkTechnology(networkInfo),
                 pairs
             )
         }