Skip to content

Commit a26aafe

Browse files
didiergarciadidiergarcia
authored
Merge pull request #4 from segment-integrations/update-consent-dependency
chore(deps): Updating kotlin-consent to version 1.5.2
2 parents 5a1838f + 2dac8fa commit a26aafe

File tree

9 files changed

+29
-21
lines changed

9 files changed

+29
-21
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For more information on on Segment Managed CMP, including how to use this integr
1111
To get started add the dependency for OneTrust CMP consent integration to your app's build.gradle file:
1212

1313
```groovy
14-
implementation 'com.segment.analytics.kotlin.destinations:consent-onetrust:<LATEST_VERSION>'
14+
implementation 'com.segment.analytics.kotlin.consent:consent-onetrust:<LATEST_VERSION>'
1515
```
1616

1717

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ android.enableJetifier=true
2121
kotlin.code.style=official
2222

2323
# Deployment variables
24-
GROUP=com.segment.analytics.kotlin.destinations
24+
GROUP=com.segment.analytics.kotlin.consent
2525

2626
VERSION_CODE=101
2727
VERSION_NAME=1.0.1
2828

2929
POM_ARTIFACT_ID=consent-onetrust
30-
POM_NAME=consent-ontrust
30+
POM_NAME=conset-onetrust
3131
POM_DESCRIPTION=Twilio consent managment integration with OneTrust CMP.
3232

3333
POM_URL=https://github.com/segment-integrations/analytics-kotlin-consent-onetrust

‎lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
compileSdk = 33
1313
buildToolsVersion = "33.0.0"
1414

15-
namespace = "com.segment.analytics.kotlin.destinations.consent.onetrust"
15+
namespace = "com.segment.analytics.kotlin.consent.onetrust"
1616

1717
defaultConfig {
1818
multiDexEnabled = true
@@ -41,7 +41,7 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation("com.segment.analytics.kotlin.destinations:consent:1.4.0")
44+
implementation("com.segment.analytics.kotlin:consent:1.5.2")
4545
implementation("androidx.multidex:multidex:2.0.1")
4646
implementation("androidx.core:core-ktx:1.10.1")
4747
implementation("androidx.lifecycle:lifecycle-process:2.6.1")

lib/src/main/java/com/segment/analytics/kotlin/destinations/consent/onetrust/OneTrustConsentCategoryProvider.kt renamed to lib/src/main/java/com/segment/analytics/kotlin/consent/onetrust/OneTrustConsentCategoryProvider.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.segment.analytics.kotlin.destinations.consent.onetrust
1+
package com.segment.analytics.kotlin.consent.onetrust
22

33
import com.onetrust.otpublishers.headless.Public.OTPublishersHeadlessSDK
4-
import com.segment.analytics.kotlin.destinations.consent.ConsentCategoryProvider
4+
import com.segment.analytics.kotlin.consent.ConsentCategoryProvider
55

66
class OneTrustConsentCategoryProvider(
77
val otPublishersHeadlessSDK: OTPublishersHeadlessSDK,

lib/src/main/java/com/segment/analytics/kotlin/destinations/consent/onetrust/OneTrustConsentChangedNotifier.kt renamed to lib/src/main/java/com/segment/analytics/kotlin/consent/onetrust/OneTrustConsentChangedNotifier.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.segment.analytics.kotlin.destinations.consent.onetrust
1+
package com.segment.analytics.kotlin.consent.onetrust
22

33
import android.content.BroadcastReceiver
44
import android.content.Context
55
import android.content.Intent
66
import android.content.IntentFilter
77
import com.onetrust.otpublishers.headless.Public.Keys.OTBroadcastServiceKeys
8-
import com.segment.analytics.kotlin.destinations.consent.ConsentManager
8+
import com.segment.analytics.kotlin.consent.ConsentManager
99
import java.lang.ref.WeakReference
1010

1111
class OneTrustConsentChangedNotifier(

‎testapp/build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ plugins {
55

66
android {
77
compileSdk = 33
8-
namespace = "com.segment.analytics.destinations.mydestination.testapp"
8+
namespace = "com.segment.analytics.consent.onetrust.testapp"
99
defaultConfig {
10-
applicationId = "com.segment.analytics.destinations.mydestination.testapp"
10+
applicationId = "com.segment.analytics.consent.onetrust.testapp"
1111
minSdk = 24
1212
targetSdk = 33
1313
versionCode = 1
@@ -37,11 +37,10 @@ android {
3737
dependencies {
3838
implementation(project(mapOf("path" to ":lib")))
3939

40-
implementation("com.segment.analytics.kotlin.destinations:consent:1.4.0")
40+
implementation("com.segment.analytics.kotlin:consent:1.5.2")
4141

4242
implementation("com.onetrust.cmp:native-sdk:202309.1.0.0")
4343
implementation("com.squareup.okhttp3:okhttp:4.10.0")
44-
implementation("com.segment.analytics.kotlin:destination-filters:0.1.1")
4544
implementation(project(":lib"))
4645

4746
implementation("androidx.core:core-ktx:1.10.1")

testapp/src/main/java/com/segment/analytics/destinations/mydestination/testapp/MainActivity.kt renamed to testapp/src/main/java/com/segment/analytics/consent/onetrust/testapp/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.segment.analytics.destinations.mydestination.testapp
1+
package com.segment.analytics.consent.onetrust.testapp
22

33
import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle

testapp/src/main/java/com/segment/analytics/destinations/mydestination/testapp/MainApplication.kt renamed to testapp/src/main/java/com/segment/analytics/consent/onetrust/testapp/MainApplication.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.segment.analytics.destinations.mydestination.testapp
1+
package com.segment.analytics.consent.onetrust.testapp
22

33
import android.app.Application
44
import android.content.Context
@@ -10,8 +10,8 @@ import com.segment.analytics.kotlin.android.Analytics
1010
import com.segment.analytics.kotlin.core.Analytics
1111
import com.segment.analytics.kotlin.core.platform.policies.CountBasedFlushPolicy
1212
import com.segment.analytics.kotlin.core.platform.policies.FrequencyFlushPolicy
13-
import com.segment.analytics.kotlin.destinations.consent.ConsentManager
14-
import com.segment.analytics.kotlin.destinations.consent.onetrust.OneTrustConsentCategoryProvider
13+
import com.segment.analytics.kotlin.consent.ConsentManager
14+
import com.segment.analytics.kotlin.consent.onetrust.OneTrustConsentCategoryProvider
1515
import org.json.JSONException
1616
import org.json.JSONObject
1717
import sovran.kotlin.SynchronousStore
@@ -81,6 +81,15 @@ class MainApplication : Application() {
8181

8282
analytics.add(consentPlugin)
8383

84+
// This is commented out because before we start allowing events to flow
85+
// we want to make sure that our CMP OneTrust has started and we're able
86+
// to get the current consent settings from it.
87+
//
88+
// See below where we call this function inside the OneTrust success
89+
// callback.
90+
//
91+
// consentPlugin.start()
92+
8493
otPublishersHeadlessSDK.startSDK(
8594
DOMAIN_URL,
8695
DOMAIN_ID,
@@ -91,11 +100,11 @@ class MainApplication : Application() {
91100
override fun onSuccess(otSuccessResponse: OTResponse) {
92101
// do logic to render UI getOTSDKData();
93102
val otData =
94-
MainApplication.otPublishersHeadlessSDK.bannerData.toString()
103+
otPublishersHeadlessSDK.bannerData.toString()
95104
Log.d(TAG, "OT onSuccess: otData: $otData")
96105

97106
val categories =
98-
getGroupIds(MainApplication.otPublishersHeadlessSDK.domainGroupData)
107+
getGroupIds(otPublishersHeadlessSDK.domainGroupData)
99108

100109
Log.d(TAG, "Setting up Analytics with categories: ${categories}")
101110
consentCategoryProvider.setCategoryList(categories)

testapp/src/main/java/com/segment/analytics/destinations/mydestination/testapp/WebhookDestination.kt renamed to testapp/src/main/java/com/segment/analytics/consent/onetrust/testapp/WebhookDestination.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.segment.analytics.destinations.mydestination.testapp
1+
package com.segment.analytics.consent.onetrust.testapp
22

33
import android.util.Log
44
import com.segment.analytics.kotlin.core.*
@@ -21,7 +21,7 @@ class WebhookPlugin(val webhookUrl: String) : DestinationPlugin() {
2121
override lateinit var analytics: Analytics
2222
val JSON = "application/json; charset=utf-8".toMediaType()
2323
val okHttpClient = OkHttpClient()
24-
private val TAG = MainApplication.TAG + "/WebhookDestination"
24+
private val TAG = MainApplication.TAG + "/WebhookDestination"
2525

2626

2727
override fun track(payload: TrackEvent): BaseEvent? {

0 commit comments

Comments
 (0)