From f0b7e2ac508460b6e384e7fb6d6e197527fa8ec1 Mon Sep 17 00:00:00 2001 From: Neelkanth Kaushik Date: Thu, 31 Jul 2025 17:54:09 +0530 Subject: [PATCH 1/3] Downgraded minSdk version from 24 to 16 --- lib/build.gradle.kts | 2 +- .../com/segment/analytics/kotlin/consent/ConsentBlocker.kt | 2 +- .../com/segment/analytics/kotlin/consent/ConsentManager.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 31f27a7..a8e3a38 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -16,7 +16,7 @@ android { defaultConfig { multiDexEnabled = true - minSdk = 24 + minSdk = 16 targetSdk = 33 testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" diff --git a/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentBlocker.kt b/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentBlocker.kt index 7743e67..13ad346 100644 --- a/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentBlocker.kt +++ b/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentBlocker.kt @@ -66,7 +66,7 @@ open class ConsentBlocker( val categoryPreferenceJson = consentJsonObject[CATEGORY_PREFERENCE_KEY] if (categoryPreferenceJson != null) { val categoryPreferenceJsonObject = categoryPreferenceJson as JsonObject - categoryPreferenceJsonObject.forEach { category, consentGiven -> + for ((category, consentGiven) in categoryPreferenceJsonObject) { if (consentGiven.toString() == "true") { // Add this category to the list of necessary categories consentJsonArray.add(category) diff --git a/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentManager.kt b/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentManager.kt index 5978e93..4d90ad3 100644 --- a/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentManager.kt +++ b/lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentManager.kt @@ -97,8 +97,8 @@ class ConsentManager( val allCategories = mutableListOf() var enabledAtSegment = true - // Add all mappings - settings.integrations.forEach { integrationName, integrationJson -> + + for ((integrationName, integrationJson) in settings.integrations) { // If the integration has the consent key: integrationJson.jsonObject[CONSENT_SETTINGS_KEY]?.let { @@ -164,7 +164,7 @@ class ConsentManager( */ private fun stampEvent(event: BaseEvent) { event.context = buildJsonObject { - event.context.forEach { key, json -> + for ((key, json) in event.context) { put(key, json) } put(CONSENT_KEY, buildJsonObject { From fe00ac35c158b8ed5956c3238b339bf1f3143cad Mon Sep 17 00:00:00 2001 From: Neelkanth Kaushik Date: Thu, 31 Jul 2025 18:05:12 +0530 Subject: [PATCH 2/3] Updated version in gradle.properties --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 32bca83..3e4a297 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,8 +23,8 @@ kotlin.code.style=official # Deployment variables GROUP=com.segment.analytics.kotlin -VERSION_CODE=161 -VERSION_NAME=1.6.1 +VERSION_CODE=162 +VERSION_NAME=1.6.2 POM_ARTIFACT_ID=consent POM_NAME=consent From eb3cbc2d4d65aed25ab6f038f870c539572c6bd4 Mon Sep 17 00:00:00 2001 From: Neelkanth Kaushik Date: Thu, 31 Jul 2025 18:09:13 +0530 Subject: [PATCH 3/3] Updated actions/cache@v2 to actions/cache@v4 --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1421d39..a40be69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,11 +24,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: cache gradle dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d1df06..b04e8a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: cache gradle dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 2911185..650fc48 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -9,11 +9,11 @@ jobs: runs-on: ubuntu-latest environment: deployment steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: cache gradle dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches