Merge pull request #135 from launchdarkly/yus/sc-184207/react-native-client-sdk-add-support-for-application

[sc-184207] Support for application tags

Author: yusinto

.circleci/config.yml

@@ -49,6 +49,16 @@ jobs:
             mkdir -p test
             cd test
             [ -d "CITest" ] || npx react-native@<<parameters.rn-version>> init CITest --version <<parameters.rn-version>> --skip-install
+            
+            # HACK: rn 0.64.x init the test project targeting ios 10, which is incompatible with the ios SDK which requires
+            # a minimum of ios 11
+            sed -i.bak "s/platform :ios, '10.0'/platform :ios, '11.0'/" CITest/ios/Podfile
+            sed -i.bak "s/IPHONEOS_DEPLOYMENT_TARGET = 10.0;/IPHONEOS_DEPLOYMENT_TARGET = 11.0;/" CITest/ios/CITest.xcodeproj/project.pbxproj
+
+            #HACK: force rn android 0.64.x init to use minSdkVersion 30 to pass the build
+            sed -i.bak 's/buildToolsVersion = "29.0.3"/buildToolsVersion = "30.0.2"/' CITest/android/build.gradle
+            sed -i.bak "s/compileSdkVersion = 29/compileSdkVersion = 31/" CITest/android/build.gradle
+            sed -i.bak "s/targetSdkVersion = 29/targetSdkVersion = 31/" CITest/android/build.gradle
 
       - save_cache:
           name: Save RN project template to cache
@@ -141,12 +151,12 @@ workflows:
           name: rn<<matrix.rn-version>>-xc<<matrix.xcode-version>>-build-apps-using-template
           matrix:
             parameters:
-              rn-version: ["0.64.3", "0.65.2", "0.66.4", "0.67.3", "0.68.0","0.69.4", "0.70.1"]
-              xcode-version: ["12.5.1", "13.2.1", "13.4.1", "14.0.1"]
+              rn-version: [ "0.64.4", "0.65.2", "0.66.4", "0.67.3", "0.68.0","0.69.4", "0.70.1" ]
+              xcode-version: [ "12.5.1", "13.2.1", "13.4.1", "14.0.1" ]
             exclude:
-              - rn-version: "0.64.3"
+              - rn-version: "0.64.4"
                 xcode-version: "13.4.1"
-              - rn-version: "0.64.3"
+              - rn-version: "0.64.4"
                 xcode-version: "14.0.1"
               - rn-version: "0.65.2"
                 xcode-version: "13.4.1"

ManualTestApp/android/build.gradle

@@ -2,7 +2,6 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
         minSdkVersion = 21
         compileSdkVersion = 30
         targetSdkVersion = 30
@@ -13,7 +12,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath('com.android.tools.build:gradle:7.4.0')
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

ManualTestApp/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ManualTestApp/ios/Podfile.lock

@@ -72,14 +72,14 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - LaunchDarkly (6.1.0):
-    - LaunchDarkly/Core (= 6.1.0)
+  - LaunchDarkly (7.1.0):
+    - LaunchDarkly/Core (= 7.1.0)
   - launchdarkly-react-native-client-sdk (6.2.4):
-    - LaunchDarkly (= 6.1.0)
+    - LaunchDarkly (= 7.1.0)
     - React-Core
-  - LaunchDarkly/Core (6.1.0):
-    - LDSwiftEventSource (= 1.3.1)
-  - LDSwiftEventSource (1.3.1)
+  - LaunchDarkly/Core (7.1.0):
+    - LDSwiftEventSource (= 3.0.0)
+  - LDSwiftEventSource (3.0.0)
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.180)
   - RCT-Folly (2021.06.28.00-v2):
@@ -510,13 +510,13 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
-  LaunchDarkly: 44e1728319bd7693a2a619561a8237187406b920
-  launchdarkly-react-native-client-sdk: c7ad1b9af7c33b2af5eac2a536756b4af0135773
-  LDSwiftEventSource: 1ac1b0986a07c5fe4f2c94d87f1d41f4de6ae727
+  glog: bbaccdf9af7ec106ed6f0eb086217dc2bf37414c
+  LaunchDarkly: 31da8b77e96cb744417208478bb5b24f35fd2491
+  launchdarkly-react-native-client-sdk: d40d2a6c7d6e578c6bc528c403e8f94b2cd02ffa
+  LDSwiftEventSource: 824ce51a4fa8e79498c9b67ae672bfa802bd7464
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
-  RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
+  RCT-Folly: 19dac003a3f572f05a3b77277df72906a73469f1
   RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab
   RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1
   React: dec6476bc27155b250eeadfc11ea779265f53ebf

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.0'
     }
 }
 
@@ -22,9 +22,11 @@ android {
         versionName = "1.0"
         consumerProguardFiles("consumer-proguard-rules.pro")
     }
+
     lintOptions {
         abortOnError false
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -33,6 +35,22 @@ android {
 
 allprojects {
     repositories {
+        // Ripped from https://stackoverflow.com/questions/74333787/react-native-2-files-found-with-path-lib-arm64-v8a-libfbjni-so-from-inputs
+        exclusiveContent {
+            // We get React Native's Android binaries exclusively through npm,
+            // from a local Maven repo inside node_modules/react-native/.
+            // (The use of exclusiveContent prevents looking elsewhere like Maven Central
+            // and potentially getting a wrong version.)
+            filter {
+                includeGroup "com.facebook.react"
+            }
+            forRepository {
+                maven {
+                    url "$rootDir/../node_modules/react-native/android"
+                }
+            }
+        }
+        
         mavenLocal()
         google()
         mavenCentral()
@@ -45,7 +63,7 @@ allprojects {
 
 dependencies {
     implementation("com.facebook.react:react-native:+")
-    implementation("com.launchdarkly:launchdarkly-android-client-sdk:3.2.0")
+    implementation("com.launchdarkly:launchdarkly-android-client-sdk:3.6.0")
     implementation("com.jakewharton.timber:timber:5.0.1")
     implementation("com.google.code.gson:gson:2.8.9")
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Jan 26 10:47:00 PST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

android/src/main/java/com/launchdarkly/reactnative/LaunchdarklyReactNativeClientModule.java

@@ -28,6 +28,7 @@
 import com.launchdarkly.sdk.LDValue;
 import com.launchdarkly.sdk.ObjectBuilder;
 import com.launchdarkly.sdk.UserAttribute;
+import com.launchdarkly.sdk.android.Components;
 import com.launchdarkly.sdk.android.ConnectionInformation;
 import com.launchdarkly.sdk.android.FeatureFlagChangeListener;
 import com.launchdarkly.sdk.android.LDAllFlagsListener;
@@ -36,6 +37,7 @@
 import com.launchdarkly.sdk.android.LDFailure;
 import com.launchdarkly.sdk.android.LDStatusListener;
 import com.launchdarkly.sdk.android.LaunchDarklyException;
+import com.launchdarkly.sdk.android.integrations.ApplicationInfoBuilder;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -51,7 +53,6 @@
 import timber.log.Timber;
 
 public class LaunchdarklyReactNativeClientModule extends ReactContextBaseJavaModule {
-
     private static final Gson gson = new Gson();
     private static final String ERROR_INIT = "E_INITIALIZE";
     private static final String ERROR_IDENTIFY = "E_IDENTIFY";
@@ -64,6 +65,7 @@ public class LaunchdarklyReactNativeClientModule extends ReactContextBaseJavaMod
     private final Map<String, FeatureFlagChangeListener> listeners = new HashMap<>();
     private final Map<String, LDStatusListener> connectionModeListeners = new HashMap<>();
     private final Map<String, LDAllFlagsListener> allFlagsListeners = new HashMap<>();
+
     public LaunchdarklyReactNativeClientModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
@@ -252,13 +254,6 @@ private void internalConfigure(ReadableMap config, ReadableMap user, final Integ
 
         final LDConfig.Builder ldConfigBuilder = configBuild(config);
         final LDUser ldUser = userBuild(user).build();
-
-        if (config.hasKey("allUserAttributesPrivate")
-                && config.getType("allUserAttributesPrivate").equals(ConfigEntryType.Boolean.getReadableType())
-                && config.getBoolean("allUserAttributesPrivate")) {
-            ldConfigBuilder.allAttributesPrivate();
-        }
-
         final Application application = (Application) getReactApplicationContext().getApplicationContext();
 
         if (application != null) {
@@ -285,14 +280,37 @@ public void run() {
         }
     }
 
-    private LDConfig.Builder configBuild(ReadableMap options) {
-        LDConfig.Builder builder = new LDConfig.Builder();
+    private LDConfig.Builder configBuild(ReadableMap config) {
+        LDConfig.Builder ldConfigBuilder = new LDConfig.Builder();
 
+        // build trivial config options
         for (ConfigMapping entry : ConfigMapping.values()) {
-            entry.loadFromMap(options, builder);
+            entry.loadFromMap(config, ldConfigBuilder);
+        }
+
+        // build application tags
+        if (config.hasKey("application") && config.getType("application") == ReadableType.Map) {
+            ReadableMap application = config.getMap("application");
+            ApplicationInfoBuilder applicationInfoBuilder = Components.applicationInfo();
+
+            if (application.hasKey("id") && application.getType("id") == ReadableType.String) {
+                applicationInfoBuilder.applicationId(application.getString("id"));
+            }
+            if (application.hasKey("version") && application.getType("version") == ReadableType.String) {
+                applicationInfoBuilder.applicationVersion(application.getString("version"));
+            }
+
+            ldConfigBuilder.applicationInfo(applicationInfoBuilder);
+        }
+
+        // build private user attributes
+        if (config.hasKey("allUserAttributesPrivate")
+                && config.getType("allUserAttributesPrivate").equals(ConfigEntryType.Boolean.getReadableType())
+                && config.getBoolean("allUserAttributesPrivate")) {
+            ldConfigBuilder.allAttributesPrivate();
         }
 
-        return builder;
+        return ldConfigBuilder;
     }
 
     private LDUser.Builder userBuild(ReadableMap options) {

ios/LaunchdarklyReactNativeClient.swift

@@ -97,6 +97,20 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
             try! ldConfig.setSecondaryMobileKeys(val)
         }
 
+        if let c = config["application"] as? [String: String] {
+            var applicationInfo = ApplicationInfo()
+            
+            if let applicationId = c["id"] {
+                applicationInfo.applicationIdentifier(applicationId)
+            }
+            
+            if let applicationVersion = c["version"] {
+                applicationInfo.applicationVersion(applicationVersion)
+            }
+            
+            ldConfig.applicationInfo = applicationInfo
+        }
+        
         return ldConfig
     }
 

ios/LaunchdarklyReactNativeClient.xcodeproj/project.pbxproj

@@ -92,6 +92,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
@@ -169,7 +170,7 @@
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -220,7 +221,7 @@
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

launchdarkly-react-native-client-sdk.podspec

@@ -9,12 +9,12 @@ Pod::Spec.new do |s|
   s.homepage     = package["homepage"]
   s.license      = { :type => "Apache-2.0", :file => "LICENSE" }
   s.author       = { "author" => "[email protected]" }
-  s.platform     = :ios, "10.0"
+  s.platform     = :ios, "11.0"
   s.source       = { :git => "https://github.com/launchdarkly/react-native-client-sdk.git", :tag => s.version }
   s.source_files  = "ios/**/*.{h,m,swift}"
   s.swift_version = "5.0"
 
   s.dependency "React-Core"
-  s.dependency "LaunchDarkly", "6.1.0"
+  s.dependency "LaunchDarkly", "7.1.0"
 
 end