prepare 5.1.1 release

.circleci/config.yml

@@ -1,63 +1,79 @@
 version: 2.1
+
+orbs:
+  android: circleci/[email protected]
+  node: circleci/[email protected]
+
+aliases:
+  - &use_local_sdk
+    name: Set hello application to use local SDK and RN version
+    command: |
+      cd ../hello-react-native
+      TEMP_FILE=`mktemp -u` || exit 1
+      sed 's/"launchdarkly-react-native-client-sdk" *: *"[^"]*" *, *$/"launchdarkly-react-native-client-sdk": "file:..\/project"\,/' 'package.json' > $TEMP_FILE
+      mv $TEMP_FILE 'package.json'
+
 jobs:
   android:
     parameters:
       hello-app-branch:
         type: string
-    docker:
-      - image: circleci/android@sha256:9d2e4571898fd9b1dc97bfb9da942aaeea46859eb5b1e4cfc85a44c42733643c
-    environment:
-      QEMU_AUDIO_DRV: none
-      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Xms2048m -Xmx4096m"
-      GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+
+    executor:
+      name: android/android-machine
+      resource-class: large
+
     steps:
       - checkout
 
-      - setup_remote_docker:
-          docker_layer_caching: true
-          reusable: true  # Deprecated version of above
-
-      - run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
-      - run: sdkmanager "system-images;android-24;default;armeabi-v7a"
-      - run: sdkmanager --licenses
-      - run: sudo apt-get update && sudo apt-get install libpulse0
-      - run: echo no | avdmanager create avd -n rn-android -f -k "system-images;android-24;default;armeabi-v7a"
-      - run: 
-          command: emulator -avd rn-android -netdelay none -netspeed full -no-audio -no-window -no-snapshot -use-system-libs -no-boot-anim
-          background: true
-          timeout: 1200
-          no_output_timeout: 20m
-      - run: sudo npm install -g react-native-cli
-      - run: cd .. && git clone https://github.com/launchdarkly/hello-react-native.git
-      - run: cd ../hello-react-native && git checkout <<parameters.hello-app-branch>> && npm install
-      - run: cp -r ../project/ ../hello-react-native/node_modules/launchdarkly-react-native-client-sdk/
-      - run: circle-android wait-for-boot
-      - run: 
-          command: cd ../hello-react-native && react-native run-android
-          background: true
-          timeout: 1200
+      - run: cd .. && git clone --depth 1 https://github.com/launchdarkly/hello-react-native.git -b <<parameters.hello-app-branch>>
+      - run: *use_local_sdk
+      - node/install:
+          lts: true
+          install-yarn: true
+      - run:
+          name: Build bundle
+          command: |
+            cd ../hello-react-native
+            npx yarn install
+            npx react-native bundle --entry-file index.js --platform android --bundle-output android/main.jsbundle --assets-dest android
+      - run:
+          name: Setup debug keystore
+          command: |
+            keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
+            cp debug.keystore ../hello-react-native/android/app/
+            mkdir -p ~/.android
+            cp debug.keystore ~/.android/
+      - run: cd ../hello-react-native/android && ./gradlew packageDebug
 
   ios:
     parameters:
       hello-app-branch:
         type: string
     macos:
-      xcode: "11.4"
+      xcode: "12.4.0"
     steps:
       - checkout
-
-      - run: xcrun simctl create rn-ios com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-2
-      - run: xcrun simctl boot rn-ios
-      - run: cd .. && git clone https://github.com/launchdarkly/hello-react-native.git
-      - run: cd ../hello-react-native && git checkout <<parameters.hello-app-branch>> && npm install
-      - run: sudo npm install -g react-native-cli
-      - run: cp -r ../project/ ../hello-react-native/node_modules/launchdarkly-react-native-client-sdk/
-      # Newer cocoapods required for following pod install
-      - run: sudo gem install cocoapods
-      # RN 0.64 has an issue with embedding absolute paths in the cocoapods generated build files, so must regenerate.
-      # https://github.com/facebook/react-native/issues/31121
-      - run: cd ../hello-react-native/ios && pod update && pod install
-      - run: cd ../hello-react-native && react-native run-ios --configuration Release --simulator rn-ios
+      - run: cd .. && git clone --depth 1 https://github.com/launchdarkly/hello-react-native.git -b <<parameters.hello-app-branch>>
+      - run: *use_local_sdk
+      - run: cd ../hello-react-native && npx yarn install
+      - run:
+          name: Build bundle
+          command: |
+            cd ../hello-react-native
+            npx yarn install
+            npx react-native bundle --entry-file index.js --platform ios --bundle-output ios/main.jsbundle --assets-dest ios
+      - run:
+          name: Build application
+          command: |
+            cd ../hello-react-native/ios
+            # Newer cocoapods required for following pod install
+            sudo gem install cocoapods
+            # RN 0.64 has an issue with embedding absolute paths in the cocoapods generated build files, so must regenerate.
+            # https://github.com/facebook/react-native/issues/31121
+            pod update
+            pod install
+            xcodebuild build -workspace HelloReactNative.xcworkspace -configuration Release -scheme HelloReactNative -sdk iphonesimulator -arch x86_64 CODE_SIGN_IDENTITY=
 
   common:
     docker:
@@ -102,4 +118,3 @@ workflows:
           hello-app-branch: rn-0.64
           requires:
             - common
-

android/build.gradle

@@ -1,32 +1,25 @@
 buildscript {
-    ext {
-        buildToolsVersion = "28.0.2"
-        minSdkVersion = 21
-        compileSdkVersion = 28
-        targetSdkVersion = 28
-        supportLibVersion = "28.0.0"
-    }
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion = 31
+    buildToolsVersion = "30.0.3"
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion(21)
+        targetSdkVersion(31)
+        versionCode = 1
+        versionName = "1.0"
         consumerProguardFiles("consumer-proguard-rules.pro")
     }
     lintOptions {
@@ -42,7 +35,6 @@ allprojects {
     repositories {
         mavenLocal()
         google()
-        jcenter()
         mavenCentral()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -53,8 +45,8 @@ allprojects {
 
 dependencies {
     implementation("com.facebook.react:react-native:+")
-    implementation("com.launchdarkly:launchdarkly-android-client-sdk:3.1.1")
-    implementation("com.jakewharton.timber:timber:4.7.1")
-    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("com.launchdarkly:launchdarkly-android-client-sdk:3.1.2")
+    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation("com.google.code.gson:gson:2.8.9")
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

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

@@ -215,17 +215,7 @@ private void internalConfigure(ReadableMap config, ReadableMap user, final Integ
         }
 
         final LDConfig.Builder ldConfigBuilder = configBuild(config);
-        final LDUser.Builder userBuilder = userBuild(user);
-
-        if (ldConfigBuilder == null) {
-            promise.reject(ERROR_INIT, "Client could not be built using supplied configuration");
-            return;
-        }
-
-        if (userBuilder == null) {
-            promise.reject(ERROR_INIT, "User could not be built using supplied configuration");
-            return;
-        }
+        final LDUser ldUser = userBuild(user).build();
 
         if (config.hasKey("allUserAttributesPrivate")
             && config.getType("allUserAttributesPrivate").equals(ConfigEntryType.Boolean.getReadableType()) 
@@ -240,10 +230,10 @@ private void internalConfigure(ReadableMap config, ReadableMap user, final Integ
                 @Override
                 public void run() {
                     if (timeout != null) {
-                        LDClient.init(application, ldConfigBuilder.build(), userBuilder.build(), timeout);
+                        LDClient.init(application, ldConfigBuilder.build(), ldUser, timeout);
                     } else {
                         try {
-                            LDClient.init(application, ldConfigBuilder.build(), userBuilder.build()).get();
+                            LDClient.init(application, ldConfigBuilder.build(), ldUser).get();
                         } catch (ExecutionException | InterruptedException e) {
                             Timber.e(e, "Exception during Client initialization");
                         }
@@ -270,13 +260,12 @@ private LDConfig.Builder configBuild(ReadableMap options) {
     }
 
     private LDUser.Builder userBuild(ReadableMap options) {
-        if (!options.hasKey("key")) {
-            return null;
+        String userKey = null;
+        if (options.hasKey("key") && options.getType("key") == ReadableType.String) {
+            userKey = options.getString("key");
         }
 
-        String key = options.getString("key");
-        LDUser.Builder userBuilder = new LDUser.Builder(key);
-
+        LDUser.Builder userBuilder = new LDUser.Builder(userKey);
         Set<String> privateAttrs = new HashSet<>();
 
         if (options.hasKey("privateAttributeNames") &&
@@ -612,16 +601,12 @@ public void close(Promise promise) {
 
     @ReactMethod
     public void identify(ReadableMap options, final Promise promise) {
-        final LDUser.Builder userBuilder = userBuild(options);
-        if (userBuilder == null) {
-            promise.reject(ERROR_IDENTIFY, "User could not be built using supplied configuration");
-            return;
-        }
+        final LDUser user = userBuild(options).build();
         Thread background = new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
-                    LDClient.get().identify(userBuilder.build()).get();
+                    LDClient.get().identify(user).get();
                     promise.resolve(null);
                 } catch (InterruptedException e) {
                     Timber.w(e);
@@ -640,20 +625,15 @@ public void run() {
 
     @ReactMethod
     public void alias(String environment, ReadableMap user, ReadableMap previousUser) {
-        LDUser.Builder userBuilder = userBuild(user);
-        LDUser.Builder previousUserBuilder = userBuild(previousUser);
-        if (userBuilder == null || previousUserBuilder == null) {
-            return;
-        }
         try {
-            LDClient.getForMobileKey(environment).alias(userBuilder.build(), previousUserBuilder.build());
+            LDClient.getForMobileKey(environment).alias(userBuild(user).build(), userBuild(previousUser).build());
         } catch (LaunchDarklyException e) {
             Timber.w("LaunchDarkly alias called with invalid environment");
         }
     }
 
     @ReactMethod
-    public void getConnectionMode(String environment,Promise promise) {
+    public void getConnectionMode(String environment, Promise promise) {
         try {
             promise.resolve(LDClient.getForMobileKey(environment).getConnectionInformation().getConnectionMode().name());
         } catch (Exception e) {
@@ -662,7 +642,7 @@ public void getConnectionMode(String environment,Promise promise) {
     }
 
     @ReactMethod
-    public void getLastSuccessfulConnection(String environment,Promise promise) {
+    public void getLastSuccessfulConnection(String environment, Promise promise) {
         try {
             promise.resolve(LDClient.getForMobileKey(environment).getConnectionInformation().getLastSuccessfulConnection().intValue());
         } catch (Exception e) {
@@ -671,7 +651,7 @@ public void getLastSuccessfulConnection(String environment,Promise promise) {
     }
 
     @ReactMethod
-    public void getLastFailedConnection(String environment,Promise promise) {
+    public void getLastFailedConnection(String environment, Promise promise) {
         try {
             promise.resolve(LDClient.getForMobileKey(environment).getConnectionInformation().getLastFailedConnection().intValue());
         } catch (Exception e) {
@@ -680,7 +660,7 @@ public void getLastFailedConnection(String environment,Promise promise) {
     }
 
     @ReactMethod
-    public void getLastFailure(String environment,Promise promise) {
+    public void getLastFailure(String environment, Promise promise) {
         try {
             promise.resolve(LDClient.getForMobileKey(environment).getConnectionInformation().getLastFailure().getFailureType().name());
         } catch (Exception e) {

index.d.ts

@@ -197,8 +197,15 @@ declare module 'launchdarkly-react-native-client-sdk' {
 
         /**
          * A unique string identifying a user.
+         *
+         * If this value is not provided, a key will be generated automatically and the `anonymous`
+         * property of the user will be set to `true`. The SDK will provide a key value that is
+         * non-identifying, unique between devices, but usually stable between launches of the
+         * application on a specific device. The SDK cannot guarantee the value will not change
+         * between launches as the platform may change identifiers provided to the application or
+         * remove the locally stored application data.
          */
-        key: string;
+        key?: string;
 
         /**
          * The secondary key for the user. See the 

ios/LaunchdarklyReactNativeClient.podspec

@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.swift_version = "5.0"
 
   s.dependency "React"
-  s.dependency "LaunchDarkly", "5.4.3"
+  s.dependency "LaunchDarkly", "5.4.4"
 
 end