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
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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.2", ext: "aar") {
transitive = true
}
// For < 0.71, this will be from the local maven repo
Expand Down
8 changes: 4 additions & 4 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" tools:node="replace" />
<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="replace" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="replace" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions example/App.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.4")
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
12 changes: 6 additions & 6 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
}
Expand Down
3 changes: 2 additions & 1 deletion example/src/presentation/components/IonIcon.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -69,9 +69,10 @@
"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",
"metro-react-native-babel-preset": "^0.76.9",
"release-it": "^15.0.0",
"typescript": "^5.0.2"
},
Expand Down