airbridge-react-native-sdk-restricted 4.6.0 → 4.7.1

package/.github/workflows/build.yml

@@ -41,13 +41,12 @@ env:
     }}
   BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}
   TYPE: ${{
-      github.event_name == 'pull_request'
-        && (
-          startsWith(github.event.pull_request.head.ref, 'release/')
-          || startsWith(github.event.pull_request.head.ref, 'hotfix/')
-        )
-        && 'Release'
-        || 'Feature'
+      (
+        startsWith(github.event.pull_request.head.ref || github.ref_name, 'release/')
+        || startsWith(github.event.pull_request.head.ref || github.ref_name, 'hotfix/')
+      )
+      && 'Release'
+      || 'Feature'
     }}
   TAG: ${{
       format(
@@ -184,6 +183,9 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
+      - name: Install missing iOS SDK platform
+        run: sudo xcodebuild -downloadPlatform iOS
+
       - name: Cache CocoaPods
         uses: actions/cache@v4
         with:
@@ -262,6 +264,9 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
+      - name: Install missing iOS SDK platform
+        run: sudo xcodebuild -downloadPlatform iOS
+        
       - name: Cache CocoaPods
         uses: actions/cache@v4
         with:

package/airbridge_sdk.json

@@ -1,4 +1,4 @@
 {
-    "ios_version": "4.6.0",
-    "android_version": "4.6.0"
+    "ios_version": "4.7.0",
+    "android_version": "4.7.0"
 }

package/android/src/main/java/co/ab180/airbridge/reactnative/extension/AirbridgeOptionBuilderApply.kt

@@ -3,6 +3,7 @@ package co.ab180.airbridge.reactnative.extension
 import co.ab180.airbridge.AirbridgeInAppPurchaseEnvironment
 import co.ab180.airbridge.AirbridgeLogLevel
 import co.ab180.airbridge.AirbridgeOptionBuilder
+import co.ab180.airbridge.common.AirbridgeTrackingBlocklist
 
 internal fun AirbridgeOptionBuilder.setAirbridgeJSON(
     airbridgeJSON: Map<String, Any>?
@@ -94,6 +95,20 @@ internal fun AirbridgeOptionBuilder.setAirbridgeJSON(
         setCollectTCFDataEnabled(it)
     }
 
+    //4.7.0
+    (json["trackingBlocklist"] as? List<*>)?.also { array ->
+        val list = mutableListOf<AirbridgeTrackingBlocklist>()
+        array.mapNotNull { it as? String }.forEach { block ->
+            when(block.lowercase()) {
+                "gaid" -> list.add(AirbridgeTrackingBlocklist.GAID)
+                "oaid" -> list.add(AirbridgeTrackingBlocklist.OAID)
+                "appsetid" -> list.add(AirbridgeTrackingBlocklist.APP_SET_ID)
+            }
+        }
+        if (list.isNotEmpty()) {
+            setTrackingBlocklist(list)
+        }
+    }
 
     return this
 }

package/android/src/main/java/co/ab180/airbridge/reactnative/module/RegisterInteractor.kt

@@ -51,7 +51,7 @@ internal class RegisterInteractor(
 
         when(value.type) {
             ReadableType.Number -> Airbridge.setUserAttribute(key, value.asDouble())
-            ReadableType.String -> Airbridge.setUserAttribute(key, value.asString())
+            ReadableType.String -> value.asString()?.run { Airbridge.setUserAttribute(key, this) }
             ReadableType.Boolean -> Airbridge.setUserAttribute(key, value.asBoolean())
             else -> {}
         }

package/changelog.md

@@ -1,3 +1,17 @@
+## 4.7.1
+
+**FIXED**
+* Fixed compatibility with `asString()` method changes in React Native 0.80's null safety updates.
+
+## 4.7.0
+
+**ADDED**
+* Added `trackingBlocklist` option that blocks specific tracking.
+
+**CHANGED**
+* Update `Airbridge Android SDK` to 4.7.0
+* Update `Airbridge iOS SDK` to 4.7.0
+
 ## 4.6.0
 
 **CHANGED**

package/ios/AirbridgeReactNative/Extension/AirbridgeOptionBuilderApply.swift

@@ -94,7 +94,23 @@ extension AirbridgeOptionBuilder {
         if let collectTCFDataEnabled = json["collectTCFDataEnabled"] as? Bool {
             setCollectTCFDataEnabled(collectTCFDataEnabled)
         }
-        
+
+        // 4.7.0
+        if let trackingBlocklist = json["trackingBlocklist"] as? Array<Any> {
+            let list = trackingBlocklist.compactMap({ $0 as? String })
+                .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+                .compactMap { block -> AirbridgeTrackingBlocklist? in
+                    switch block.lowercased() {
+                        case "idfa": return .idfa
+                        case "idfv": return .idfv
+                        default: return nil
+                    }
+                }
+            if !list.isEmpty {
+                setTrackingBlocklist(list)
+            }
+        }
+
         return self
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airbridge-react-native-sdk-restricted",
-  "version": "4.6.0",
+  "version": "4.7.1",
   "description": "Airbridge SDK for React Native",
   "main": "build/source/module.js",
   "types": "build/source/module.d.ts",

package/qa/airbridge_qa.json

@@ -1,6 +1,6 @@
 {
     "internal_library": {
         "ios_version": null,
-        "android_version": "4.6.0-build-+"
+        "android_version": null
     }
 }

package/qa/android/app/src/main/java/co/ab180/airbridge/qa/application/ConfigurationLoader.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import co.ab180.airbridge.reactnative.AirbridgeReactNative
 import co.ab180.airbridge.reactnative.common.AirbridgeJSON
 import co.ab180.configuration.Loader
+import co.ab180.configuration.model.Configuration
 import org.json.JSONObject
 import java.lang.reflect.Field
 
@@ -38,14 +39,21 @@ class ConfigurationLoader {
         }
     }
 
-    // android - 4.4.0 기준
     // Loader.convertAirbridgeJsonFormat 에 아래 항목이 누락됨
-    // collectTCFDataEnabled
+    // trackingBlocklist
     private fun loadOption(context: Context): Map<String, Any> =
         Loader.loadOption(context)
             .let {
-                Loader.convertAirbridgeJsonFormat(it) +
-                        ("collectTCFDataEnabled" to it.collectTCFDataEnabled)
+                val result = Loader.convertAirbridgeJsonFormat(it).toMutableMap()
+
+                it.trackingBlocklist
+                    .takeUnless { it.isNullOrEmpty() }
+                    ?.split(",")
+                    ?.map { item -> item.trim() }
+                    ?.toList()
+                    ?.run { result.put("trackingBlocklist", this) }
+
+                result
             }
             .also { Log.d(TAG, "loadOption : $it") }
 }

package/qa/ios/AirbridgeQA/AirbridgeJSONSwizzler.swift

@@ -69,6 +69,13 @@ public class AirbridgeJSONSwizzler: NSObject {
     newDic["collectTCFDataEnabled"] = configuration.isCollectTCFDataEnabled
     newDic["inAppPurchaseEnvironment"] = configuration.inAppPurchaseEnvironment
     
+    // ios - 4.7.0 기준
+    // trackingBlocklist
+    // comma seperate 를 Array 로 변환 하여 전달
+    newDic["trackingBlocklist"] = configuration.trackingBlocklist
+      .split(separator: ",")
+      .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+    
     configuration.applyToStorage()
     NSLog("Swizzling AirbridgeJSON loadOption: \(newDic)")
     return newDic

package/qa/ios/AirbridgeQA.xcodeproj/project.pbxproj

@@ -475,7 +475,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo '{\"wrapperName\": \"airbridge-react-native-sdk\", \"wrapperVersion\": \"4.5.1\"}' > \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LibraryInfo.json\"\n";
+			shellScript = "echo '{\"wrapperName\": \"airbridge-react-native-sdk\", \"wrapperVersion\": \"4.7.0\"}' > \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LibraryInfo.json\"\n";
 		};
 		F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;

package/qa/ios/Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
-  - airbridge-ios-sdk (4.5.0)
-  - airbridge-ios-sdk-qa-library (4.5.0)
-  - airbridge-react-native-sdk (4.5.1):
-    - airbridge-ios-sdk (= 4.5.0)
+  - airbridge-ios-sdk (4.7.0)
+  - airbridge-ios-sdk-qa-library (4.7.0)
+  - airbridge-react-native-sdk (4.7.0):
+    - airbridge-ios-sdk (= 4.7.0)
     - React
   - boost (1.84.0)
   - DoubleConversion (1.1.6)
@@ -1942,9 +1942,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  airbridge-ios-sdk: 946af56d181b7a0844cc238b7e44d3ca769dece7
-  airbridge-ios-sdk-qa-library: feee7ec9693a94c8560d852142c94442c494c306
-  airbridge-react-native-sdk: baa500ccf28a44abfe4e78254bb71bdb59c939e4
+  airbridge-ios-sdk: f0f227bfde8baf7b85f956b4772e32a3a2821c5a
+  airbridge-ios-sdk-qa-library: 95371d16e0ecd8578d5d4be901be262fc9ba062d
+  airbridge-react-native-sdk: a45768deb6456e26eca373cb16932364228dc420
   boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
   DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
   FBAEMKit: e34530df538b8eb8aeb53c35867715ba6c63ef0c

package/qa/package-lock.json

@@ -43,7 +43,7 @@
       }
     },
     "..": {
-      "version": "4.6.0",
+      "version": "4.7.1",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.12",

package/qa/run-test-env.sh

@@ -51,4 +51,4 @@ echo "## AIRBRIDGE_ENVIRONMENT: $AIRBRIDGE_ENVIRONMENT"
 echo "###############################################"
 echo ""
 
-react-native $RUN_PLATFORM --port=9000
+npx react-native $RUN_PLATFORM --port=9000

package/qa/test/airbridge.development.json

@@ -1,5 +1,6 @@
 {
     "sessionTimeoutInSecond": 30,
     "collectTCFDataEnabled": true,
-    "logLevel": "debug"
+    "logLevel": "debug",
+    "trackingBlocklist": ["gaid", "appsetid", "idfa", "idfv"]
 }