diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a0213d..d08059b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,3 +9,6 @@ - Bohdan Pidluzhnyy - bpidluzhnyy@blackberry.com - Eugeniy Leontiev - eleontiev@blackberry.com - Nazarii Shavuk - nshavuk@blackberry.com +- Uliana Varlamova - uvarlamova@blackberry.com +- Vikas Bansal - vbansal@blackberry.com +- Madhav Srivastava - masrivastava@blackberry.com \ No newline at end of file diff --git a/README.md b/README.md index 03ca671..53738d7 100644 --- a/README.md +++ b/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 diff --git a/modules/BlackBerry-Dynamics-for-React-Native-AppKinetics/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-AppKinetics/android/build.gradle index e586f88..30d3c0a 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-AppKinetics/android/build.gradle +++ b/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' } diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Application/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Application/android/build.gradle index e586f88..d82487d 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Application/android/build.gradle +++ b/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' +} \ No newline at end of file diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Async-Storage/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Async-Storage/android/build.gradle index c2f20c5..4e0a695 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Async-Storage/android/build.gradle +++ b/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:+" -} +} \ No newline at end of file diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/README.md b/modules/BlackBerry-Dynamics-for-React-Native-Base/README.md index b90ee1f..f4d0490 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/README.md +++ b/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//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 `/BlackBerry_Dynamics_SDK_for_React_Native_vX.X.X.X/modules/` and ui-components from `/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 +// Repeat this command to remove all appropriate modules and ui-components +$ yarm remove BlackBerry-Dynamics-for-React-Native- +$ 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 /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 /BlackBerry_Dynamics_SDK_for_React_Native_vX.X.X.X/modules/ +$ cd ios +$ pod install +$ cd .. +``` + ## Installation #### react-native diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Base/android/build.gradle index a1419a7..1cf420d 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/android/build.gradle +++ b/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:+" } diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/android/gd.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Base/android/gd.gradle index 120e342..44cd1a2 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/android/gd.gradle +++ b/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' +} \ No newline at end of file diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/android/helper.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Base/android/helper.gradle index 3de76bc..97b66bd 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/android/helper.gradle +++ b/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 } diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/package.json b/modules/BlackBerry-Dynamics-for-React-Native-Base/package.json index cd3b0a9..6390179 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/package.json +++ b/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": { diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/BlackBerryDynamics.podspec b/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/BlackBerryDynamics.podspec index 0019ab6..d275514 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/BlackBerryDynamics.podspec +++ b/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' diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/constants.js b/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/constants.js index c27bacd..f07b56a 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/constants.js +++ b/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) => '(.+)'/; diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/react_native_info/development-tools-info.json b/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/react_native_info/development-tools-info.json index b6a6a51..fa218ba 100755 --- a/modules/BlackBerry-Dynamics-for-React-Native-Base/scripts/react_native_info/development-tools-info.json +++ b/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": { diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Clipboard/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Clipboard/android/build.gradle index 923414e..f65dbfa 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Clipboard/android/build.gradle +++ b/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:+" -} +} \ No newline at end of file diff --git a/modules/BlackBerry-Dynamics-for-React-Native-FileSystem/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-FileSystem/android/build.gradle index 0681ec1..dacf4c6 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-FileSystem/android/build.gradle +++ b/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:+" diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Launcher/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Launcher/android/build.gradle index 5dc49db..83096c8 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Launcher/android/build.gradle +++ b/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') diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Networking/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-Networking/android/build.gradle index f164133..d99a78a 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Networking/android/build.gradle +++ b/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:+" diff --git a/modules/BlackBerry-Dynamics-for-React-Native-Networking/ios/BbdRNWebSocket/BbdRCTNetworking.mm b/modules/BlackBerry-Dynamics-for-React-Native-Networking/ios/BbdRNWebSocket/BbdRCTNetworking.mm index bcf2e1f..36a6895 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-Networking/ios/BbdRNWebSocket/BbdRCTNetworking.mm +++ b/modules/BlackBerry-Dynamics-for-React-Native-Networking/ios/BbdRNWebSocket/BbdRCTNetworking.mm @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 BlackBerry Limited. All Rights Reserved. + * Copyright (c) 2023 BlackBerry Limited. All Rights Reserved. * Some modifications to the original WebSocket API of react-native * from https://github.com/facebook/react-native/blob/0.61-stable/Libraries/Network * @@ -291,7 +291,10 @@ - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary *)q } }]; - request.timeoutInterval = [RCTConvert NSTimeInterval:query[@"timeout"]]; + // Fix for the issue when request are failing because of timeout on 11.0 core sdk + if ((double)[RCTConvert NSTimeInterval:query[@"timeout"]] > 0) { + request.timeoutInterval = [RCTConvert NSTimeInterval:query[@"timeout"]]; + } NSDictionary *data = [RCTConvert NSDictionary:RCTNilIfNull(query[@"data"])]; NSString *trackingName = data[@"trackingName"]; if (trackingName) { diff --git a/modules/BlackBerry-Dynamics-for-React-Native-SQLite-Storage/android/build.gradle b/modules/BlackBerry-Dynamics-for-React-Native-SQLite-Storage/android/build.gradle index 20937a9..31a6064 100644 --- a/modules/BlackBerry-Dynamics-for-React-Native-SQLite-Storage/android/build.gradle +++ b/modules/BlackBerry-Dynamics-for-React-Native-SQLite-Storage/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 "com.facebook.react:react-native:+" -} +} \ No newline at end of file diff --git a/ui-components/BlackBerry-Dynamics-for-React-Native-Text/android/build.gradle b/ui-components/BlackBerry-Dynamics-for-React-Native-Text/android/build.gradle index e132f8f..f65dbfa 100644 --- a/ui-components/BlackBerry-Dynamics-for-React-Native-Text/android/build.gradle +++ b/ui-components/BlackBerry-Dynamics-for-React-Native-Text/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.facebook.react:react-native:+" -} + 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:+" +} \ No newline at end of file diff --git a/ui-components/BlackBerry-Dynamics-for-React-Native-TextInput/android/build.gradle b/ui-components/BlackBerry-Dynamics-for-React-Native-TextInput/android/build.gradle index 923414e..66420c4 100644 --- a/ui-components/BlackBerry-Dynamics-for-React-Native-TextInput/android/build.gradle +++ b/ui-components/BlackBerry-Dynamics-for-React-Native-TextInput/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:+" } diff --git a/ui-components/BlackBerry-Dynamics-for-React-Native-WebView/android/build.gradle b/ui-components/BlackBerry-Dynamics-for-React-Native-WebView/android/build.gradle index e6c57ad..0163fd0 100644 --- a/ui-components/BlackBerry-Dynamics-for-React-Native-WebView/android/build.gradle +++ b/ui-components/BlackBerry-Dynamics-for-React-Native-WebView/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. @@ -62,9 +62,9 @@ android { def kotlin_version = getExtOrDefault('kotlinVersion') 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_webview: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.blackberry.blackberrydynamics:android_webview:11.1.0.62' implementation project(path: ':BlackBerry-Dynamics-for-React-Native-Base') implementation "com.facebook.react:react-native:+" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"