WIP: fix updated package

android/build.gradle

@@ -1,33 +1,41 @@
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["BlePlx_" + name]).toInteger()
 }
 
 buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+  }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 27)
-    buildToolsVersion safeExtGet('buildToolsVersion', '27.0.3')
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion safeExtGet('targetSdkVersion', 27)
-    }
-    lintOptions {
-        abortOnError false
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 repositories {

android/gradle.properties

@@ -0,0 +1,5 @@
+BlePlx_kotlinVersion=1.7.0
+BlePlx_minSdkVersion=23
+BlePlx_targetSdkVersion=31
+BlePlx_compileSdkVersion=31
+BlePlx_ndkversion=21.4.7075529

android/src/main/AndroidManifest.xml

@@ -1,11 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.polidea.reactnativeble">
-    <!-- Android >= 12 -->
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <!-- Android < 12 -->
-    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
-
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 </manifest>

example/android/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "33.0.0"
-        minSdkVersion = 21
+        minSdkVersion = 23
         compileSdkVersion = 33
         targetSdkVersion = 33
 

example/src/screens/MainStack/DashboardScreen/DashboardScreen.tsx

@@ -16,7 +16,8 @@ export const DashboardScreen = (_props: DashboardScreenProps) => {
     setBLEReady(true)
   }
 
-  const addFoundDevice = (device: Device) =>
+  const addFoundDevice = (device: Device) => {
+    console.log('found device', device.id)
     setFoundDevices(prevState => {
       const indexToReplace = prevState.findIndex(currentDevice => currentDevice.id === device.id)
       if (indexToReplace === -1) {
@@ -25,6 +26,7 @@ export const DashboardScreen = (_props: DashboardScreenProps) => {
       prevState[indexToReplace] = device
       return prevState
     })
+  }
 
   useEffect(() => {
     BLEService.initializeBLE(onBLEReady)
@@ -41,6 +43,7 @@ export const DashboardScreen = (_props: DashboardScreenProps) => {
   return (
     <ScreenDefaultContainer>
       <AppButton label="Look for devices" onPress={() => BLEService.scanDevices(addFoundDevice)} />
+      <AppButton label="Request bluetooth permission" onPress={() => BLEService.requestBluetoothPermission()} />
       <FlatList
         style={{ flex: 1 }}
         data={foundDevices}

example/src/services/BLEService/BLEService.ts

@@ -127,7 +127,7 @@ class BLEServiceInstance {
       }
    };
 
-   private requestBluetoothPermission = async () => {
+   public requestBluetoothPermission = async () => {
       try {
          const grantedLocation = await PermissionsAndroid.request(
             PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,

package.json

@@ -6,6 +6,25 @@
   "react-native": "index.js",
   "source": "index.js",
   "types": "index.d.ts",
+  "files": [
+    "src",
+    "lib",
+    "android",
+    "ios",
+    "cpp",
+    "*.podspec",
+    "!lib/typescript/example",
+    "!ios/build",
+    "!android/build",
+    "!android/gradle",
+    "!android/gradlew",
+    "!android/gradlew.bat",
+    "!android/local.properties",
+    "!**/__tests__",
+    "!**/__fixtures__",
+    "!**/__mocks__",
+    "!**/.*"
+  ],
   "scripts": {
     "test": "jest",
     "lint": "flow && documentation lint index.js",
@@ -38,7 +57,7 @@
     "metro-react-native-babel-preset": "^0.64.0",
     "prettier": "^2.1.1",
     "react": "17.0.2",
-    "react-native": "0.65.1"
+    "react-native": "0.70.0"
   },
   "keywords": [
     "React",
@@ -49,6 +68,10 @@
     "BLE",
     "Polidea"
   ],
+  "engines": {
+    "node": ">= 16.0.0"
+  },
+  "packageManager": "^[email protected]",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [

turbo.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "pipeline": {
+    "build:android": {
+      "inputs": [
+        "package.json",
+        "android",
+        "!android/build",
+        "src/*.ts",
+        "src/*.tsx",
+        "example/package.json",
+        "example/android",
+        "!example/android/.gradle",
+        "!example/android/build",
+        "!example/android/app/build"
+      ],
+      "outputs": []
+    },
+    "build:ios": {
+      "inputs": [
+        "package.json",
+        "*.podspec",
+        "ios",
+        "src/*.ts",
+        "src/*.tsx",
+        "example/package.json",
+        "example/ios",
+        "!example/ios/build",
+        "!example/ios/Pods"
+      ],
+      "outputs": []
+    }
+  }
+}