bridgefy-react-native 1.1.8 → 1.2.0

package/android/build.gradle

@@ -1,74 +1,51 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["BridgefyReactNative_kotlinVersion"]
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['BridgefyReactNative_' + name]
+  }
 
+  rootProject.allprojects {
+    repositories {
+      maven {
+        url "https://maven.bridgefy.me/artifactory/libs-release-local"
+      }
+    }
+  }
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.5.2"
+    classpath "com.android.tools.build:gradle:8.7.2"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-rootProject.allprojects {
-  repositories {
-    maven {
-      url "http://34.82.5.94:8081/artifactory/libs-release-local"
-      allowInsecureProtocol = true
-    }
-  }
-}
-
-allprojects {
-  repositories {
-    google()
-    mavenCentral()
-  }
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["BridgefyReactNative_" + name]
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["BridgefyReactNative_" + name]).toInteger()
 }
 
 android {
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
+  namespace "me.bridgefy.plugin.react_native"
 
-  kotlinOptions {
-    jvmTarget = '17'
-  }
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
+
+  buildFeatures {
+    buildConfig true
+  }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -78,6 +55,20 @@ android {
   lintOptions {
     disable "GradleCompatible"
   }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+    }
+  }
 }
 
 repositories {
@@ -88,20 +79,9 @@ repositories {
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.3", ext: "aar") {
+  implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.5", ext: "aar") {
     transitive = true
   }
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "BridgefyReactNative"
-    codegenJavaPackageName = "me.bridgefy.plugin.react_native"
-  }
-}

package/android/gradle.properties

@@ -1,5 +1,5 @@
-BridgefyReactNative_kotlinVersion=2.0.20
-BridgefyReactNative_minSdkVersion=21
-BridgefyReactNative_targetSdkVersion=35
+BridgefyReactNative_kotlinVersion=2.0.21
+BridgefyReactNative_minSdkVersion=24
+BridgefyReactNative_targetSdkVersion=34
 BridgefyReactNative_compileSdkVersion=35
-BridgefyReactNative_ndkversion=28.0.12916984
+BridgefyReactNative_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1,12 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="me.bridgefy.plugin.react_native">
-  <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" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>