Merge pull request #26 from vbansal-bb/master

Updated Dynamics SDK for iOS and Dynamics SDK for Android versions fo…

CONTRIBUTING.md

@@ -9,3 +9,6 @@
 - Bohdan Pidluzhnyy - [email protected]
 - Eugeniy Leontiev - [email protected]
 - Nazarii Shavuk - [email protected]
+- Uliana Varlamova - [email protected]
+- Vikas Bansal - [email protected]
+- Madhav Srivastava - [email protected]

README.md

@@ -1,5 +1,5 @@
 # BlackBerry Dynamics SDK for React Native
-This page provides an overview on how to use the BlackBerry Dynamics SDK for React Native. For details on BlackBerry Dynamics please see https://www.blackberry.com/dynamics
+This page provides an overview on how to use the BlackBerry Dynamics SDK for React Native. For details on BlackBerry Dynamics please see https://docs.blackberry.com/en/endpoint-management/blackberry-dynamics
 
 # Supportability
 #### Development environment
@@ -18,20 +18,31 @@ This page provides an overview on how to use the BlackBerry Dynamics SDK for Rea
  - 0.68.x (0.68.2 is latest supported)
 #### iOS
  - Xcode 12+
- - iOS 14+
+ - iOS 14+ (for BlackBerry Dynamics SDK for iOS v11.1)
+ - iOS 15+ (for BlackBerry Dynamics SDK for iOS v11.2)
  - cocoapods 1.10.2+
 #### Android
  - Java 8 (for React Native version < 0.68.0)
  - Java 11 (for React Native version >= 0.68.0)
- - Android 9+, API 28+
+ - Android 9+, API 28+ (for BlackBerry Dynamics SDK for Android v11.1)
+ - Android 10+, API 29+ (for BlackBerry Dynamics SDK for Android v11.2)
  - NDK 20.1.5948944 (for React Native version < 0.66.0)
  - NDK 21.4.7075529 (for React Native version >= 0.66.0)
 #### BlackBerry Dynamics
- - BlackBerry Dynamics SDK for iOS v11.0, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-ios/).
- - BlackBerry Dynamics SDK for Android v11.0, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-android/).
+Dynamics SDK for iOS and Android are now installed as part of the [Base](https://github.com/blackberry/BlackBerry-Dynamics-React-Native-SDK/tree/master/modules/BlackBerry-Dynamics-for-React-Native-Base) module using CocoaPods & Gradle.  
+By default, `BlackBerry-Dynamics-for-React-Native-Base` module will integrate **11.1** (11.1.0.62) version of BlackBerry Dynamics SDK for Android and iOS.  
+To integrate **11.2** version see "Using other released version" [instructions](https://github.com/blackberry/BlackBerry-Dynamics-React-Native-SDK/tree/master/modules/BlackBerry-Dynamics-for-React-Native-Base#dynamics-sdk-dependency) for both iOS and Android platforms in [BlackBerry-Dynamics-for-React-Native-Base](https://github.com/blackberry/BlackBerry-Dynamics-React-Native-SDK/tree/master/modules/BlackBerry-Dynamics-for-React-Native-Base#dynamics-sdk-dependency).
+
+BlackBerry Dynamics SDK for iOS
+ - BlackBerry Dynamics SDK for iOS v11.1, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-ios/11_1).
+ - BlackBerry Dynamics SDK for iOS v11.2, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-ios/11_2).
+
+ BlackBerry Dynamics SDK for Android
+ - BlackBerry Dynamics SDK for Android v11.1, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-android/11_1).
+ - BlackBerry Dynamics SDK for Android v11.2, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-android/11_2).
 #### BlackBerry Dynamics Launcher
- - BlackBerry Dynamics Launcher library for iOS v3.5, check details [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-launcher-framework-for-ios).
- - BlackBerry Dynamics Launcher library for Android v3.5, check details [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-launcher-framework-for-android).
+ - BlackBerry Dynamics Launcher library for iOS v3.5, check details [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-launcher-framework-for-ios/3_5).
+ - BlackBerry Dynamics Launcher library for Android v3.5, check details [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-launcher-framework-for-android/3_5).
 
 # Features
 #### Integration with BlackBerry Dynamics

modules/BlackBerry-Dynamics-for-React-Native-AppKinetics/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,6 @@ android {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation project(path: ':BlackBerry-Dynamics-for-React-Native-Base')
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
 }

modules/BlackBerry-Dynamics-for-React-Native-Application/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,6 @@ android {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation project(path: ':BlackBerry-Dynamics-for-React-Native-Base')
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
-}
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
+}

modules/BlackBerry-Dynamics-for-React-Native-Async-Storage/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  * Some modifications to the original @react-native-community/async-storage
  * from https://github.com/react-native-community/async-storage/
  */
@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
     implementation "com.facebook.react:react-native:+"
-}
+}

modules/BlackBerry-Dynamics-for-React-Native-Base/README.md

@@ -26,18 +26,27 @@ Please setup your environment as described in the [React Native documentation](h
 
 Dynamics SDK for iOS and Android are now installed as part of the Base module using CocoaPods & Gradle. The integration uses the iOS "Dynamic Framework" version of BlackBerry Dynamics as the static library is no longer supported.
 
+Supported Dynamics SDK for iOS versions:
+- 11.1, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-ios/11_1)
+- 11.2, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-ios/11_2)
+
+Supported Dynamics SDK for Android versions:
+- 11.1, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-android/11_1)
+- 11.2, check environment requirements [here](https://docs.blackberry.com/en/development-tools/blackberry-dynamics-sdk-android/11_2)
+
 ##### BlackBerry Dynamics SDK for iOS integration
-###### Using latest released version - default
-By default, `BlackBerry-Dynamics-for-React-Native-Base` module will integrate **latest** available BlackBerry Dynamics SDK for iOS using following podspec: `https://software.download.blackberry.com/repository/framework/dynamics/ios/11.0.1.137/BlackBerryDynamics-11.0.1.137.podspec`.
+###### Using default (11.1) released version - default
+By default, `BlackBerry-Dynamics-for-React-Native-Base` module will integrate **11.1** (11.1.0.62) version of BlackBerry Dynamics SDK for iOS using following podspec: `https://software.download.blackberry.com/repository/framework/dynamics/ios/11.1.0.62/BlackBerryDynamics-11.1.0.62.podspec`.
 > NOTE: If one of the below integration methods was used there is an option to reset **default** configuration by running following command:
 `$ yarn set-dynamics-podspec --default`
 `$ cd ios && pod install && cd ..`
 
 ###### Using other released version
 There is possibility to integrate other released build of BlackBerry Dynamics SDK for iOS.
-Following command should be run:
+Currently, the **latest** supported versions is 11.2.  
+Following command should be run to use BlackBerry Dynamics SDK for iOS v11.2:
 ```
-$ yarn set-dynamics-podspec --url "https://software.download.blackberry.com/repository/framework/dynamics/ios/10.2.0.83/BlackBerryDynamics-10.2.0.83.podspec"
+$ yarn set-dynamics-podspec --url "https://software.download.blackberry.com/repository/framework/dynamics/ios/11.2.0.26/BlackBerryDynamics-11.2.0.26.podspec"
 $ cd ios && pod install && cd ..
 ```
 ###### Using locally downloaded version
@@ -48,6 +57,37 @@ $ yarn set-dynamics-podspec --path "/Users/<user>/Downloads/gdsdk-release-dylib-
 $ cd ios && pod install && cd ..
 ```
 
+##### BlackBerry Dynamics SDK for Android integration
+By default, `BlackBerry-Dynamics-for-React-Native-Base` module will integrate **11.1** (11.1.0.62) version of BlackBerry Dynamics SDK for Android.
+###### Using other released version
+There is possibility to integrate other released build of BlackBerry Dynamics SDK for Android.  
+Currently, the **latest** supported versions is 11.2.  
+Following steps should be done to use BlackBerry Dynamics SDK for Android v11.2:
+- update versions of Dynamics dependencies in all modules from `<path>/BlackBerry_Dynamics_SDK_for_React_Native_vX.X.X.X/modules/` and ui-components from `<path>/BlackBerry_Dynamics_SDK_for_React_Native_vX.X.X.X/ui-components/`:
+    ```
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.2.0.13'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.2.0.13'
+    implementation 'com.blackberry.blackberrydynamics:android_webview:11.2.0.13'
+    ```
+- if your application contains some modules or ui-components from BlackBerry_Dynamics_SDK_for_React_Native, you will need to uninstall them first by using following commands:
+```
+$ cd <path_to_your_app>
+// Repeat this command to remove all appropriate modules and ui-components
+$ yarm remove BlackBerry-Dynamics-for-React-Native-<name>
+$ cd ios  
+$ pod install  
+$ cd .. 
+```
+- install modules and ui-components from BlackBerry_Dynamics_SDK_for_React_Native with updated dependencies version by using following commands:
+```
+$ yarn add <path>/BlackBerry_Dynamics_SDK_for_React_Native_vX.X.X.X/modules/BlackBerry-Dynamics-for-React-Native-Base
+// Repeat this command for all appropriate modules and ui-components
+$ yarn add <path>/BlackBerry_Dynamics_SDK_for_React_Native_vX.X.X.X/modules/<name>
+$ cd ios  
+$ pod install  
+$ cd .. 
+```
+
 ## Installation
 
 #### react-native

modules/BlackBerry-Dynamics-for-React-Native-Base/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 apply plugin: "com.android.library"
 
 buildscript {
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
     implementation "com.facebook.react:react-native:+"
 }

modules/BlackBerry-Dynamics-for-React-Native-Base/android/gd.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
-}
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
+}

modules/BlackBerry-Dynamics-for-React-Native-Base/android/helper.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 ext {
     getBbdMavenLocation = 'https://software.download.blackberry.com/repository/maven'
-    minSdkVersion = 28
+    minSdkVersion = 29
 }

modules/BlackBerry-Dynamics-for-React-Native-Base/package.json

@@ -1,7 +1,7 @@
 {
   "name": "BlackBerry-Dynamics-for-React-Native-Base",
   "version": "1.0.0",
-  "dynamicsPodSpec":"https://software.download.blackberry.com/repository/framework/dynamics/ios/11.0.1.137/BlackBerryDynamics-11.0.1.137.podspec",
+  "dynamicsPodSpec":"https://software.download.blackberry.com/repository/framework/dynamics/ios/11.1.0.62/BlackBerryDynamics-11.1.0.62.podspec",
   "description": "This is a BlackBerry Dynamics Base module for React Native that automatically integrates the BlackBerry Dynamics SDK for iOS and Android into a React Native application",
   "main": "index.js",
   "bin": {

modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/BlackBerryDynamics.podspec

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+# Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ Pod::Spec.new do |spec|
   spec.description         = <<-DESC
                           Framework for building secure enterprise applications managed by BlackBerry Unified Endpoint Management (UEM).
                           DESC
-  spec.platform            = :ios, '13.0'
+  spec.platform            = :ios, '15.0'
   spec.source              = { :git => "", :tag => "#{spec.version}" }
   spec.requires_arc        = true
   spec.swift_version       = '5.0'

modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/constants.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ const updatePodsCommand = '\t\tsystem("node ../node_modules/BlackBerry-Dynamics-
   '/scripts/updatePods.js")\n';
 
 const podPlatformPatternVersion = /platform :ios, '([0-9\.]+)'/;
-const podPlatformVersion = 'platform :ios, \'14.0\'';
+const podPlatformVersion = 'platform :ios, \'15.0\'';
 
 const bbdPodCommand = 'pod \'BlackBerryDynamics\', ' +
-  ':podspec => \'https://software.download.blackberry.com/repository/framework/dynamics/ios/11.0.1.137/BlackBerryDynamics-11.0.1.137.podspec\'\n';
+  ':podspec => \'https://software.download.blackberry.com/repository/framework/dynamics/ios/11.1.0.62/BlackBerryDynamics-11.1.0.62.podspec\'\n';
 
 const bbdPodTemplate = /pod 'BlackBerryDynamics', (:podspec|:path) => '(.+)'/;
 

modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/react_native_info/development-tools-info.json

@@ -1,7 +1,7 @@
 {
   "framework": {
     "name": "ReactNative",
-    "bbdSdkForReactNativeVersion": "11.0.0.6",
+    "bbdSdkForReactNativeVersion": "11.1.0.5",
     "react-native": "",
     "react": "",
     "system": {

modules/BlackBerry-Dynamics-for-React-Native-Clipboard/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
     implementation "com.facebook.react:react-native:+"
-}
+}

modules/BlackBerry-Dynamics-for-React-Native-FileSystem/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
     implementation project(path: ':BlackBerry-Dynamics-for-React-Native-Base')
     implementation project(path: ':BlackBerry-Dynamics-for-React-Native-Networking')
     implementation "com.facebook.react:react-native:+"

modules/BlackBerry-Dynamics-for-React-Native-Launcher/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,8 +47,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
     implementation "com.facebook.react:react-native:+"
     implementation project(path: ':BlackBerry-Dynamics-for-React-Native-Base')
 

modules/BlackBerry-Dynamics-for-React-Native-Networking/android/build.gradle

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.0.1.140'
-    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.0.1.140'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_platform:11.1.0.62'
+    implementation 'com.blackberry.blackberrydynamics:android_handheld_backup_support:11.1.0.62'
     implementation "com.facebook.react:react-native:+"
     implementation "com.squareup.okhttp3:okhttp:+"
     implementation "com.squareup.okio:okio:+"