Skip to content

Commit 4d6bc3e

Browse files
authored
Merge pull request #1273 from dotintent/chore/update-react-native
Chore/update react native
2 parents 4a31df2 + 38bee82 commit 4d6bc3e

File tree

38 files changed

+3793
-2871
lines changed

38 files changed

+3793
-2871
lines changed

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ untyped-import
8181
untyped-type-import
8282

8383
[version]
84-
^0.203.1
84+
^0.259.1

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ jobs:
5454
matrix:
5555
configurations:
5656
[
57-
{ react_native_version: '0.72.6', node_version: 18 },
58-
{ react_native_version: '0.71.14', node_version: 18 },
59-
{ react_native_version: '0.70.13', node_version: 18 }
57+
{ react_native_version: '0.77.0', node_version: 18 },
58+
{ react_native_version: '0.76.6', node_version: 18 },
59+
# { react_native_version: '0.75.4', node_version: 18 }
6060
]
6161
env:
6262
TURBO_CACHE_DIR: .turbo/android
@@ -116,9 +116,9 @@ jobs:
116116
matrix:
117117
configurations:
118118
[
119-
{ react_native_version: '0.72.6', node_version: 18 },
120-
{ react_native_version: '0.71.14', node_version: 18 },
121-
{ react_native_version: '0.70.13', node_version: 18 }
119+
{ react_native_version: '0.77.0', node_version: 18 },
120+
{ react_native_version: '0.76.6', node_version: 18 },
121+
{ react_native_version: '0.75.4', node_version: 18 }
122122
]
123123
env:
124124
TURBO_CACHE_DIR: .turbo/ios

__tests__/BleManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ test('BleManager properly monitors characteristic value', async () => {
340340
subscription.remove()
341341
expect(listener).toHaveBeenCalledTimes(2)
342342
expect(Native.BleModule.cancelTransaction).toBeCalledWith('x')
343-
expect(Native.BleModule.monitorCharacteristicForDevice).toBeCalledWith('id', 'aaaa', 'bbbb', 'x')
343+
expect(Native.BleModule.monitorCharacteristicForDevice).toBeCalledWith('id', 'aaaa', 'bbbb', 'x', undefined)
344344
})
345345

346346
test('BleManager properly handles errors while monitoring characteristic values', async () => {

__tests__/Characteristic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe("Test if Characteristic is properly calling BleManager's utility functi
3232
test('monitor', async () => {
3333
const listener = jest.fn()
3434
await characteristic.monitor(listener, 'id')
35-
expect(bleManager._monitorCharacteristic).toBeCalledWith('cId', listener, 'id')
35+
expect(bleManager._monitorCharacteristic).toBeCalledWith('cId', listener, 'id', undefined)
3636
})
3737

3838
test('readDescriptor', async () => {

__tests__/Device.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe("Test if Device is properly calling BleManager's utility function:", ()
7272
test('monitorCharacteristicForService', async () => {
7373
const listener = jest.fn()
7474
await device.monitorCharacteristicForService('aaaa', 'bbbb', listener, 'id')
75-
expect(bleManager.monitorCharacteristicForDevice).toBeCalledWith('id', 'aaaa', 'bbbb', listener, 'id')
75+
expect(bleManager.monitorCharacteristicForDevice).toBeCalledWith('id', 'aaaa', 'bbbb', listener, 'id', undefined)
7676
})
7777

7878
test('readDescriptorForService', async () => {

__tests__/Service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe("Test if Service is properly calling BleManager's utility function:", (
3434
test('monitorCharacteristic', async () => {
3535
const listener = jest.fn()
3636
await service.monitorCharacteristic('bbbb', listener, 'id')
37-
expect(bleManager._monitorCharacteristicForService).toBeCalledWith('serviceId', 'bbbb', listener, 'id')
37+
expect(bleManager._monitorCharacteristicForService).toBeCalledWith('serviceId', 'bbbb', listener, 'id', undefined)
3838
})
3939

4040
test('readDescriptorForCharacteristic', async () => {

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath "com.android.tools.build:gradle:7.2.1"
8+
classpath "com.android.tools.build:gradle:8.8.0"
99
}
1010
}
1111

android/gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
BlePlx_kotlinVersion=1.7.0
2-
BlePlx_minSdkVersion=23
3-
BlePlx_targetSdkVersion=31
4-
BlePlx_compileSdkVersion=31
5-
BlePlx_ndkversion=21.4.7075529
1+
BlePlx_kotlinVersion=2.0.21
2+
BlePlx_minSdkVersion=24
3+
BlePlx_targetSdkVersion=34
4+
BlePlx_compileSdkVersion=35
5+
BlePlx_ndkversion=26.1.10909125

example/Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

example/android/app/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ apply plugin: "com.facebook.react"
88
*/
99
react {
1010
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '..'
12-
// root = file("../")
13-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
14-
// reactNativeDir = file("../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
16-
// codegenDir = file("../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
18-
// cliFile = file("../node_modules/react-native/cli.js")
11+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12+
// root = file("../../")
13+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14+
// reactNativeDir = file("../../node_modules/react-native")
15+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16+
// codegenDir = file("../../node_modules/@react-native/codegen")
17+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18+
// cliFile = file("../../node_modules/react-native/cli.js")
1919

2020
/* Variants */
2121
// The list of variants to that are debuggable. For those we're going to
@@ -49,6 +49,9 @@ react {
4949
//
5050
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5151
// hermesFlags = ["-O", "-output-source-map"]
52+
53+
/* Autolinking */
54+
autolinkLibrariesWithApp()
5255
}
5356

5457
/**
@@ -114,5 +117,3 @@ dependencies {
114117
implementation jscFlavor
115118
}
116119
}
117-
118-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

0 commit comments

Comments
 (0)