Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/publish-sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'

- name: Setup Ruby
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'

- name: Setup Java
Expand All @@ -115,7 +115,7 @@ jobs:
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/sample/android/Gemfile
with:
ruby-version: '2.7.6'
ruby-version: '3.1'
bundler-cache: true

- name: Get yarn lockfile hash
Expand Down
4 changes: 2 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
};
presets: ['module:@react-native/babel-preset'],
};
4 changes: 2 additions & 2 deletions docs-validation/1_introduction/SendYourFirstMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ export const platformServices: SendbirdUIKitContainerProps['platformServices'] =
* {@link https://sendbird.com/docs/chat/uikit/v3/react-native/introduction/send-first-message#2-get-started-3-step-5-wrap-your-app-in-sendbirduikitcontainer}
* */
import { SendbirdUIKitContainer } from '@sendbird/uikit-react-native';
import { MMKV } from 'react-native-mmkv';
import { createMMKV } from 'react-native-mmkv';

const mmkv = new MMKV();
const mmkv = createMMKV();

const App = () => {
return (
Expand Down
46 changes: 23 additions & 23 deletions docs-validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,40 @@
"@react-native-camera-roll/camera-roll": "^7.8.1",
"@react-native-clipboard/clipboard": "^1.14.1",
"@react-native-documents/picker": "^10.1.0",
"@react-native-firebase/messaging": "^14.7.0",
"@react-native-firebase/messaging": "^19.3.0",
"@react-navigation/native": "^6.1.17",
"@react-navigation/native-stack": "^6.10.0",
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"date-fns": "^4.1.0",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-create-thumbnail": "^2.0.0",
"react-native-file-access": "^3.1.0",
"react-native-image-picker": "^7.1.2",
"react-native-mmkv": "^2.12.2",
"react-native-nitro-modules": "^0.29.4",
"react-native-nitro-sound": "^0.2.0",
"react-native-permissions": "^3.10.1",
"react-native-safe-area-context": "^4.10.8",
"react-native-image-picker": "^8.2.0",
"react-native-mmkv": "^4.0.0",
"react-native-nitro-modules": "^0.31.5",
"react-native-nitro-sound": "^0.2.9",
"react-native-permissions": "^5.3.0",
"react-native-safe-area-context": "^5.5.2",
"react-native-video": "^6.3.0"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/runtime": "^7.12.5",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/runtime": "^7.25.0",
"@react-native-community/eslint-config": "^2.0.0",
"@types/jest": "^26.0.23",
"@types/jest": "^29.4.0",
"@types/react": "*",
"@types/react-native": "*",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"babel-jest": "^26.6.3",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"babel-jest": "^29.4.3",
"babel-loader": "^8.2.3",
"eslint": "^7.14.0",
"jest": "^26.6.3",
"metro-react-native-babel-preset": "^0.66.2",
"react-dom": "17.0.2",
"react-native-monorepo-tools": "^1.1.4",
"react-test-renderer": "18.3.1",
"typescript": "5.2.2"
"eslint": "^8.52.0",
"jest": "^29.4.3",
"@react-native/babel-preset": "0.82.1",
"react-dom": "18.2.0",
"react-test-renderer": "19.1.1",
"typescript": "5.8.3"
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
"patch-package": "^6.4.7",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.8.8",
"react": "18.2.0",
"react-native": "0.74.3",
"react-native-builder-bob": "^0.18.2",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"react-native-fast-image": "^8.6.3",
"react-native-safe-area-context": "^4.10.8",
"react-test-renderer": "^18.3.1",
"react-native-safe-area-context": "^5.5.2",
"react-test-renderer": "19.1.1",
"typedoc": "^0.25.3",
"typescript": "5.2.2",
"typescript": "5.8.3",
"yalc": "^1.0.0-pre.53"
},
"jest": {
Expand Down Expand Up @@ -98,7 +98,7 @@
]
},
"resolutions": {
"@sendbird/chat": "4.19.2",
"@sendbird/chat": "4.20.2",
"@types/react": "^18"
}
}
6 changes: 3 additions & 3 deletions packages/uikit-chat-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
"devDependencies": {
"@sendbird/uikit-testing-tools": "3.11.3",
"@types/react": "*",
"react": "18.2.0",
"react": "19.1.1",
"react-native-builder-bob": "^0.18.0",
"typescript": "5.2.2"
"typescript": "5.8.3"
},
"peerDependencies": {
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"react": ">=16.13.1"
},
"react-native-builder-bob": {
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-react-native-foundation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
"devDependencies": {
"@types/react": "*",
"@types/react-native": "*",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"react-native-fast-image": "^8.6.3",
"react-native-safe-area-context": "^4.10.8",
"typescript": "5.2.2"
"react-native-safe-area-context": "^5.5.2",
"typescript": "5.8.3"
},
"peerDependencies": {
"react": ">=17.0.2",
Expand Down
36 changes: 18 additions & 18 deletions packages/uikit-react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,21 @@
"access": "public"
},
"dependencies": {
"@openspacelabs/react-native-zoomable-view": "^2.1.5",
"@openspacelabs/react-native-zoomable-view": "<2.3.0",
"@sendbird/uikit-chat-hooks": "3.11.3",
"@sendbird/uikit-react-native-foundation": "3.11.3",
"@sendbird/uikit-tools": "0.0.15",
"@sendbird/uikit-utils": "3.11.3"
},
"devDependencies": {
"@bam.tech/react-native-image-resizer": "^3.0.4",
"@bam.tech/react-native-image-resizer": "^3.0.11",
"@react-native-async-storage/async-storage": "^1.17.6",
"@react-native-camera-roll/camera-roll": "^7.8.1",
"@react-native-clipboard/clipboard": "^1.14.1",
"@react-native-community/netinfo": "^11.3.2",
"@react-native-documents/picker": "^10.0.0",
"@react-native-firebase/app": "^14.4.0",
"@react-native-firebase/messaging": "^14.4.0",
"@react-native-documents/picker": "^10.1.0",
"@react-native-firebase/app": "^19.3.0",
"@react-native-firebase/messaging": "^19.3.0",
"@types/react": "*",
"@types/react-native": "*",
"date-fns": ">=2.28.0",
Expand All @@ -101,21 +101,21 @@
"glob": "^7.2.0",
"inquirer": "^8.2.0",
"js-convert-case": "^4.2.0",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-audio-recorder-player": "^3.6.10",
"react-native-builder-bob": "^0.18.0",
"react-native-create-thumbnail": "^2.0.0",
"react-native-create-thumbnail": "^2.1.1",
"react-native-document-picker": "^9.3.0",
"react-native-file-access": "^3.1.0",
"react-native-image-picker": "^7.1.2",
"react-native-mmkv": "^2.12.2",
"react-native-nitro-modules": "^0.29.4",
"react-native-nitro-sound": "^0.2.0",
"react-native-permissions": "^3.10.1",
"react-native-safe-area-context": "^4.10.8",
"react-native-video": "^6.3.0",
"typescript": "5.2.2"
"react-native-file-access": "^3.1.1",
"react-native-image-picker": "^8.2.0",
"react-native-mmkv": "^4.0.0",
"react-native-nitro-modules": "^0.31.5",
"react-native-nitro-sound": "^0.2.9",
"react-native-permissions": "^5.3.0",
"react-native-safe-area-context": "^5.5.2",
"react-native-video": "^6.16.1",
"typescript": "5.8.3"
},
"peerDependencies": {
"@bam.tech/react-native-image-resizer": ">=3.0.0",
Expand All @@ -125,7 +125,7 @@
"@react-native-community/netinfo": ">=9.3.0",
"@react-native-documents/picker": ">=10.0.0",
"@react-native-firebase/messaging": ">=14.4.0",
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"@sendbird/react-native-scrollview-enhancer": "*",
"@sendbird/uikit-tools": ">=0.0.10",
"date-fns": ">=2.28.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useToast,
useUIKitTheme,
} from '@sendbird/uikit-react-native-foundation';
import Icon from '@sendbird/uikit-react-native-foundation/src/components/Icon';
import { Icon } from '@sendbird/uikit-react-native-foundation';
import { ifThenOr, useSafeAreaPadding } from '@sendbird/uikit-utils';

import { useLocalization, usePlatformService } from '../../../hooks/useContext';
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-testing-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@
"access": "public"
},
"devDependencies": {
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"@sendbird/uikit-utils": "3.11.3",
"@types/jest": "^29.4.0",
"@types/react": "*",
"@types/react-native": "*",
"jest": "^29.4.3",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"typescript": "5.2.2"
"typescript": "5.8.3"
},
"react-native-builder-bob": {
"source": "src",
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
"@types/react": "*",
"@types/react-native": "*",
"date-fns": ">=2.28.0",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"typescript": "5.2.2"
"typescript": "5.8.3"
},
"peerDependencies": {
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"date-fns": ">=2.28.0",
"react": ">=17.0.2",
"react-native": ">=0.65.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/uikit-utils/src/sendbird/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function getAvailableUriFromFileMessage(message: SendbirdFileMessage) {
return message.url;
}

type RawSendbirdDataPayload = { sendbird: string | object };
type RawSendbirdDataPayload = { sendbird: string | SendbirdDataPayload };
export function isSendbirdNotification(dataPayload?: {
[key: string]: string | object;
}): dataPayload is RawSendbirdDataPayload {
Expand All @@ -128,7 +128,9 @@ export function isSendbirdNotification(dataPayload?: {
}

export function parseSendbirdNotification(dataPayload: RawSendbirdDataPayload): SendbirdDataPayload {
return typeof dataPayload.sendbird === 'string' ? JSON.parse(dataPayload.sendbird) : dataPayload.sendbird;
return typeof dataPayload.sendbird === 'string'
? JSON.parse(dataPayload.sendbird)
: (dataPayload.sendbird as SendbirdDataPayload);
}

export function shouldRenderParentMessage(
Expand Down
64 changes: 64 additions & 0 deletions patches/react-native-create-thumbnail+2.1.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
--- a/node_modules/react-native-create-thumbnail/android/build.gradle
+++ b/node_modules/react-native-create-thumbnail/android/build.gradle
@@ -38,9 +38,6 @@
}
}

-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-
android {
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
@@ -58,6 +55,11 @@
lintOptions {
abortOnError false
}
+
+ // Add for Gradle 9.0 compatibility
+ buildFeatures {
+ buildConfig true
+ }
}

repositories {
@@ -114,9 +116,8 @@
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
task androidJavadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
- classpath += files(android.bootClasspath)
- project.getConfigurations().implementation.setCanBeResolved(true)
- classpath += files(project.getConfigurations().getByName('implementation').asList())
+ // Removed deprecated classpath configuration for Gradle 9.0
+ // These methods are not compatible with newer Gradle versions
include '**/*.java'
}

@@ -134,7 +135,7 @@
android.libraryVariants.all { variant ->
def name = variant.name.capitalize()
task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider) {
- from variant.javaCompileProvider.get().destinationDir
+ from variant.javaCompileProvider.get().destinationDirectory
}
}

@@ -151,18 +152,3 @@
}
}
}
-
-def myAttribute = Attribute.of("com.android.build.api.attributes.BuildTypeAttr", String)
-
-dependencies.attributesSchema {
- // registers this attribute to the attributes schema
- attribute(myAttribute)
-}
-
-configurations {
- implementation {
- attributes {
- attribute(myAttribute, "release")
- }
- }
-}
2 changes: 2 additions & 0 deletions sample/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ local.properties
.cxx/
*.keystore
!debug.keystore
.kotlin/

# node.js
#
Expand Down Expand Up @@ -72,3 +73,4 @@ yarn-error.log
!.yarn/releases
!.yarn/sdks
!.yarn/versions

9 changes: 0 additions & 9 deletions sample/Gemfile

This file was deleted.

Loading