Merge branch 'develop' into DIA-3500-post-pv-data-call

SourcePointUSA · Oct 23, 2024 · 882f0d3 · 882f0d3
2 parents d8f16c1 + 363d623
commit 882f0d3
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 7.11.0 (October, 22, 2024)
+* [DIA-4611](https://sourcepoint.atlassian.net/browse/DIA-4611) Refactor `customConsentGDPR` and `deleteCustomConsentTo` to use `mobile-core`'s implementation. [#836](https://github.com/SourcePointUSA/android-cmp-app/pull/836)
+* Updated project dependencies and bump `minSdk` support from 21 to 23 due to [Android's new Security policy](https://developer.android.com/about/versions/14/behavior-changes-all#security) [#840](https://github.com/SourcePointUSA/android-cmp-app/pull/840)
+* Fixed an issue preventing the SDK from integrating with projects using KTor 3 [#840](https://github.com/SourcePointUSA/android-cmp-app/pull/840)
+* Bump `compileSdk` and `targetSdk` to 35
+* Fixed an issue preventing the MetaApp from being released at Google Play
+
 ## 7.11.0-rc2 (October, 18, 2024)
 * [DIA-4611](https://sourcepoint.atlassian.net/browse/DIA-4611) Refactor `customConsentGDPR` and `deleteCustomConsentTo` to use `mobile-core`'s implementation. [#836](https://github.com/SourcePointUSA/android-cmp-app/pull/836)
 * Updated project dependencies and bump `minSdk` support from 21 to 23 due to [Android's new Security policy](https://developer.android.com/about/versions/14/behavior-changes-all#security) [#840](https://github.com/SourcePointUSA/android-cmp-app/pull/831)

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ To use `cmplibrary` in your app, include `com.sourcepoint.cmplibrary:cmplibrary:
 ```
 ...
 dependencies {
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0-rc2-rc1'
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0'
 }
 ```
 

diff --git a/cmplibrary/gradle.properties b/cmplibrary/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME = 7.11.0-rc2
+VERSION_NAME = 7.11.0
 
 POM_NAME = cmplibrary
 POM_REPO = sourcepoint

diff --git a/cmplibrary/release_note.txt b/cmplibrary/release_note.txt
@@ -1,4 +1,5 @@
 * [DIA-4611](https://sourcepoint.atlassian.net/browse/DIA-4611) Refactor `customConsentGDPR` and `deleteCustomConsentTo` to use `mobile-core`'s implementation. [#836](https://github.com/SourcePointUSA/android-cmp-app/pull/836)
-* Updated project dependencies and bump `minSdk` support from 21 to 23 due to [Android's new Security policy](https://developer.android.com/about/versions/14/behavior-changes-all#security) [#840](https://github.com/SourcePointUSA/android-cmp-app/pull/831)
+* Updated project dependencies and bump `minSdk` support from 21 to 23 due to [Android's new Security policy](https://developer.android.com/about/versions/14/behavior-changes-all#security) [#840](https://github.com/SourcePointUSA/android-cmp-app/pull/840)
+* Fixed an issue preventing the SDK from integrating with projects using KTor 3 [#840](https://github.com/SourcePointUSA/android-cmp-app/pull/840)
 * Bump `compileSdk` and `targetSdk` to 35
 * Fixed an issue preventing the MetaApp from being released at Google Play
diff --git a/...brary/src/androidTest/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerImplTest.kt b/...brary/src/androidTest/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerImplTest.kt
@@ -7,8 +7,6 @@ import com.sourcepoint.cmplibrary.Utils.Companion.spEntries
 import com.sourcepoint.cmplibrary.Utils.Companion.storeTestDataObj
 import com.sourcepoint.cmplibrary.core.getOrNull
 import com.sourcepoint.cmplibrary.data.local.* //ktlint-disable
-import com.sourcepoint.cmplibrary.data.network.converter.JsonConverter
-import com.sourcepoint.cmplibrary.data.network.converter.converter
 import com.sourcepoint.cmplibrary.data.network.model.optimized.USNatConsentData
 import com.sourcepoint.cmplibrary.data.network.util.CampaignsEnv
 import com.sourcepoint.cmplibrary.exception.CampaignType

diff --git a/cmplibrary/src/main/java/com/sourcepoint/cmplibrary/data/ServiceImpl.kt b/cmplibrary/src/main/java/com/sourcepoint/cmplibrary/data/ServiceImpl.kt
@@ -734,26 +734,32 @@ internal class ServiceImpl(
         usNatApplies: Boolean?,
     ) {
         val statusMetadata = ConsentStatusRequest.MetaData(
-            gdpr = campaigns4Config.firstOrNull { it.campaignType == GDPR }?.let { ConsentStatusRequest.MetaData.Campaign(
-                applies = gdprApplies ?: false,
-                dateCreated = gdprConsentStatus?.dateCreated,
-                uuid = gdprConsentStatus?.uuid,
-                hasLocalData = false
-            ) },
-            usnat = campaigns4Config.firstOrNull { it.campaignType == USNAT }?.let { ConsentStatusRequest.MetaData.USNatCampaign(
-                applies = usNatApplies ?: false,
-                dateCreated = transitionCCPAUSnatDateCreated,
-                uuid = usNatConsentData?.uuid,
-                hasLocalData = false,
-                transitionCCPAAuth = transitionCCPAAuth,
-                optedOut = transitionCCPAOptedOut
-            ) },
-            ccpa = campaigns4Config.firstOrNull { it.campaignType == CCPA }?.let { ConsentStatusRequest.MetaData.Campaign(
-                applies = ccpaApplies ?: false,
-                dateCreated = ccpaConsentStatus?.dateCreated,
-                uuid = ccpaConsentStatus?.uuid,
-                hasLocalData = false,
-            ) }
+            gdpr = campaigns4Config.firstOrNull { it.campaignType == GDPR }?.let {
+                ConsentStatusRequest.MetaData.Campaign(
+                    applies = gdprApplies ?: false,
+                    dateCreated = gdprConsentStatus?.dateCreated,
+                    uuid = gdprConsentStatus?.uuid,
+                    hasLocalData = false
+                )
+            },
+            usnat = campaigns4Config.firstOrNull { it.campaignType == USNAT }?.let {
+                ConsentStatusRequest.MetaData.USNatCampaign(
+                    applies = usNatApplies ?: false,
+                    dateCreated = transitionCCPAUSnatDateCreated,
+                    uuid = usNatConsentData?.uuid,
+                    hasLocalData = false,
+                    transitionCCPAAuth = transitionCCPAAuth,
+                    optedOut = transitionCCPAOptedOut
+                )
+            },
+            ccpa = campaigns4Config.firstOrNull { it.campaignType == CCPA }?.let {
+                ConsentStatusRequest.MetaData.Campaign(
+                    applies = ccpaApplies ?: false,
+                    dateCreated = ccpaConsentStatus?.dateCreated,
+                    uuid = ccpaConsentStatus?.uuid,
+                    hasLocalData = false,
+                )
+            }
         )
         val response = getConsentStatus(
             authId = messageReq.authId,

diff --git a/...rary/src/main/java/com/sourcepoint/cmplibrary/data/network/converter/JsonConverterImpl.kt b/...rary/src/main/java/com/sourcepoint/cmplibrary/data/network/converter/JsonConverterImpl.kt
@@ -13,7 +13,6 @@ import com.sourcepoint.cmplibrary.model.getMap
 import com.sourcepoint.cmplibrary.model.toTreeMap
 import com.sourcepoint.cmplibrary.util.check
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonObject
 import org.json.JSONObject
 

diff --git a/.../main/java/com/sourcepoint/cmplibrary/data/network/model/optimized/MessagesApiModelExt.kt b/.../main/java/com/sourcepoint/cmplibrary/data/network/model/optimized/MessagesApiModelExt.kt
@@ -1,15 +1,11 @@
 package com.sourcepoint.cmplibrary.data.network.model.optimized
 
-import com.sourcepoint.cmplibrary.campaign.CampaignManager
 import com.sourcepoint.cmplibrary.data.network.converter.JsonConverter
 import com.sourcepoint.cmplibrary.data.network.converter.converter
-import com.sourcepoint.cmplibrary.data.network.model.optimized.includeData.buildIncludeData
 import com.sourcepoint.cmplibrary.data.network.model.optimized.messages.OperatingSystemInfoParam
 import com.sourcepoint.cmplibrary.data.network.util.CampaignsEnv
 import com.sourcepoint.cmplibrary.exception.CampaignType
 import com.sourcepoint.cmplibrary.model.CampaignReq
-import com.sourcepoint.cmplibrary.util.extensions.getGppCustomOption
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.* // ktlint-disable
 
 internal fun getMessageBody(

diff --git a/cmplibrary/src/test/java/com/sourcepoint/cmplibrary/data/network/NetworkClientImplTest.kt b/cmplibrary/src/test/java/com/sourcepoint/cmplibrary/data/network/NetworkClientImplTest.kt
@@ -3,7 +3,6 @@ package com.sourcepoint.cmplibrary.data.network
 import com.sourcepoint.cmplibrary.assertEquals
 import com.sourcepoint.cmplibrary.core.Either
 import com.sourcepoint.cmplibrary.data.network.model.optimized.* // ktlint-disable
-import com.sourcepoint.cmplibrary.data.network.model.optimized.includeData.buildIncludeData
 import com.sourcepoint.cmplibrary.data.network.util.Env
 import com.sourcepoint.cmplibrary.data.network.util.HttpUrlManagerSingleton
 import com.sourcepoint.cmplibrary.data.network.util.ResponseManager
@@ -24,7 +23,6 @@ import okhttp3.Call
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import org.json.JSONObject
 import org.junit.Assert.assertThrows
 import org.junit.Before
 import org.junit.Test

diff --git a/cmplibrary/src/test/java/com/sourcepoint/cmplibrary/data/network/util/HttpUrlManagerTest.kt b/cmplibrary/src/test/java/com/sourcepoint/cmplibrary/data/network/util/HttpUrlManagerTest.kt
@@ -15,7 +15,6 @@ import com.sourcepoint.cmplibrary.model.PMTab
 import com.sourcepoint.cmplibrary.model.PmUrlConfig
 import com.sourcepoint.cmplibrary.model.exposed.ActionType
 import com.sourcepoint.cmplibrary.model.exposed.MessageType.* // ktlint-disable
-import com.sourcepoint.cmplibrary.util.file2String
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import org.json.JSONObject
@@ -415,7 +414,7 @@ class HttpUrlManagerTest {
         sut.run {
             toString().contains("cdn.privacy-mgmt.com").assertTrue()
             queryParameter("env").assertEquals("prod")
-            queryParameter("nonKeyedLocalState")?.replace("\n","")?.replace(" ","").assertEquals("""{"_sp_v1_data":585620}""")
+            queryParameter("nonKeyedLocalState")?.replace("\n", "")?.replace(" ", "").assertEquals("""{"_sp_v1_data":585620}""")
             queryParameter("metadata").assertEquals("""{  "ccpa": {    "applies": true  },  "gdpr": {    "applies": true  }}""")
             queryParameter("scriptVersion").assertEquals(BuildConfig.VERSION_NAME)
             queryParameter("pubData").assertNull()

diff --git a/samples/metaapp/gradle.properties b/samples/metaapp/gradle.properties
@@ -1,2 +1,2 @@
-#Fri Oct 18 13:24:03 UTC 2024
-VERSION_CODE=132
+#Tue Oct 22 19:49:53 UTC 2024
+VERSION_CODE=134
diff --git a/samples/nat-message-demo/build.gradle b/samples/nat-message-demo/build.gradle
@@ -77,5 +77,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0-rc2-rc1'
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0-rc2'
 }
diff --git a/samples/web-message-demo/build.gradle b/samples/web-message-demo/build.gradle
@@ -77,5 +77,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0-rc2-rc1'
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0-rc2'
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     ...
     dependencies {
-        implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0-rc2-rc1'
+        implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.11.0'
     }
     ```
@@ Expand Down @@