From 2120e2d51923ebea46eb09ffc6662dedd9efdf7f Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 1 Nov 2024 13:15:53 -0600 Subject: [PATCH 1/7] chore: update bridgefy android sdk 1.2.0 -> 1.2.1 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 381bf3f..7550391 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -88,7 +88,7 @@ repositories { def kotlin_version = getExtOrDefault("kotlinVersion") dependencies { - implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.0", ext: "aar") { + implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.1", ext: "aar") { transitive = true } // For < 0.71, this will be from the local maven repo From d58b3c0faaf98de3c32c8d21b47b52cc17e09851 Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 1 Nov 2024 13:16:33 -0600 Subject: [PATCH 2/7] chore: update react-native plugin version 1.1.6 -> 1.1.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2ff859..dba6061 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bridgefy-react-native", - "version": "1.1.6", + "version": "1.1.7", "description": "Bridgefy React Native SDK", "main": "lib/commonjs/index", "module": "lib/module/index", From 0f4976fe10802d41333ec8fae62b87837409957f Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 1 Nov 2024 13:58:50 -0600 Subject: [PATCH 3/7] fix: update bridgefy SDK classes --- .../bridgefy/plugin/react_native/BridgefyReactNativeModule.kt | 2 +- example/android/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/me/bridgefy/plugin/react_native/BridgefyReactNativeModule.kt b/android/src/main/java/me/bridgefy/plugin/react_native/BridgefyReactNativeModule.kt index f6ef012..b8cb1b2 100644 --- a/android/src/main/java/me/bridgefy/plugin/react_native/BridgefyReactNativeModule.kt +++ b/android/src/main/java/me/bridgefy/plugin/react_native/BridgefyReactNativeModule.kt @@ -12,7 +12,7 @@ import com.facebook.react.bridge.WritableMap import com.facebook.react.modules.core.DeviceEventManagerModule import java.util.UUID import me.bridgefy.Bridgefy -import me.bridgefy.logger.enum.LogType +import me.bridgefy.logger.enums.LogType import me.bridgefy.commons.TransmissionMode import me.bridgefy.commons.exception.BridgefyException import me.bridgefy.commons.listener.BridgefyDelegate diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 6a69c10..067dd17 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -122,7 +122,7 @@ dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") } else { From 6288b305b683f063deeb28c587c88960c56c9f18 Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 31 Jan 2025 13:28:19 -0600 Subject: [PATCH 4/7] chore: update Bridgefy SDK 1.2.1 -> 1.2.2 and bluetooth permissions --- android/build.gradle | 2 +- android/src/main/AndroidManifest.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 7550391..dacf5c8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -88,7 +88,7 @@ repositories { def kotlin_version = getExtOrDefault("kotlinVersion") dependencies { - implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.1", ext: "aar") { + implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.2", ext: "aar") { transitive = true } // For < 0.71, this will be from the local maven repo diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 56dd5f2..9d91337 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -4,6 +4,8 @@ + + From 6c757cfaef47946860f48f555cf87fd9464c00dc Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 31 Jan 2025 15:52:16 -0600 Subject: [PATCH 5/7] chore: project configured --- android/build.gradle | 2 +- android/gradle.properties | 8 ++++---- android/gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/app/build.gradle | 2 +- example/android/build.gradle | 12 ++++++------ package.json | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index dacf5c8..4fae1c4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.5.0" + classpath "com.android.tools.build:gradle:8.5.2" // noinspection DifferentKotlinGradleVersion classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/android/gradle.properties b/android/gradle.properties index 2048cf8..09ac443 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ -BridgefyReactNative_kotlinVersion=1.9.23 +BridgefyReactNative_kotlinVersion=2.0.20 BridgefyReactNative_minSdkVersion=21 -BridgefyReactNative_targetSdkVersion=34 -BridgefyReactNative_compileSdkVersion=34 -BridgefyReactNative_ndkversion=21.4.7075529 +BridgefyReactNative_targetSdkVersion=35 +BridgefyReactNative_compileSdkVersion=35 +BridgefyReactNative_ndkversion=28.0.12916984 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 48c0a02..d6e308a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 067dd17..faeef92 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -122,7 +122,7 @@ dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") } else { diff --git a/example/android/build.gradle b/example/android/build.gradle index 320162b..1649dfd 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,18 +1,18 @@ buildscript { ext { - buildToolsVersion = "34.0.0" + buildToolsVersion = "35.0.0" minSdkVersion = 24 - compileSdkVersion = 34 - targetSdkVersion = 34 - ndkVersion = "26.1.10909125" - kotlinVersion = "1.9.23" + compileSdkVersion = 35 + targetSdkVersion = 35 + ndkVersion = "28.0.12916984" + kotlinVersion = "2.0.20" } repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.5.0") + classpath("com.android.tools.build:gradle:8.5.2") classpath("com.facebook.react:react-native-gradle-plugin") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin") } diff --git a/package.json b/package.json index dba6061..280443f 100644 --- a/package.json +++ b/package.json @@ -69,8 +69,8 @@ "jest": "^28.1.1", "pod-install": "^0.1.0", "prettier": "^2.8.8", - "react": "18.2.0", - "react-native": "0.72.1", + "react": "18.3.1", + "react-native": "0.76.6", "react-native-builder-bob": "^0.21.0", "release-it": "^15.0.0", "typescript": "^5.0.2" From 5f7a4ae49d70102f95966ba4e33728f012dcdc83 Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 31 Jan 2025 17:11:07 -0600 Subject: [PATCH 6/7] chore: metro-react-native-babel-preset installed --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 280443f..280b675 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "react": "18.3.1", "react-native": "0.76.6", "react-native-builder-bob": "^0.21.0", + "metro-react-native-babel-preset": "^0.76.9", "release-it": "^15.0.0", "typescript": "^5.0.2" }, From 403f932f0bfe4f3c4945b8c17f02acbfa7e8aee1 Mon Sep 17 00:00:00 2001 From: Julian de la Orta Date: Fri, 31 Jan 2025 17:27:48 -0600 Subject: [PATCH 7/7] chore: import Icon and IonIcon --- example/App.tsx | 4 ++-- example/src/presentation/components/IonIcon.tsx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/example/App.tsx b/example/App.tsx index 75dfa2e..d7f9f86 100644 --- a/example/App.tsx +++ b/example/App.tsx @@ -1,9 +1,9 @@ // import 'react-native-gesture-handler'; import {PaperProvider} from 'react-native-paper'; import {NavigationContainer} from '@react-navigation/native'; -import IonIcon from 'react-native-vector-icons/Ionicons'; - import {HomeScreen} from './src/presentation/screens'; +const IonIcon = require('react-native-vector-icons/IonIcons') + .default as React.ElementType; export const App = () => { return ( diff --git a/example/src/presentation/components/IonIcon.tsx b/example/src/presentation/components/IonIcon.tsx index c132347..5bfcf70 100644 --- a/example/src/presentation/components/IonIcon.tsx +++ b/example/src/presentation/components/IonIcon.tsx @@ -1,5 +1,6 @@ -import Icon from 'react-native-vector-icons/Ionicons'; import {globalColors} from '../theme/global.styles'; +const Icon = require('react-native-vector-icons/IonIcons') + .default as React.ElementType; interface Props { name: string;