Merge pull request #25 from neelkanth-kaushik/neelkanth-kaushik/LIBRARIES-2706

[LIBRARIES-2706] - Downgrade minSdk version from 24 to 16

Author: MichaelGHSeg

.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

.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

.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

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

lib/build.gradle.kts

@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         multiDexEnabled = true
-        minSdk = 24
+        minSdk = 16
         targetSdk = 33
 
         testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"

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)

lib/src/main/java/com/segment/analytics/kotlin/consent/ConsentManager.kt

@@ -97,8 +97,8 @@ class ConsentManager(
         val allCategories = mutableListOf<String>()
         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 {