Merge pull request #367 from ytai/api34

api34
ytai · May 10, 2024 · af0117a · af0117a
2 parents 6e177d1 + 823836e
commit af0117a
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 28 deletions.
diff --git a/IOIOLibAndroid/build.gradle b/IOIOLibAndroid/build.gradle
@@ -7,8 +7,8 @@ android {
     namespace 'ioio.lib'
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
     }
 }
 

diff --git a/IOIOLibAndroidAccessory/build.gradle b/IOIOLibAndroidAccessory/build.gradle
@@ -7,8 +7,8 @@ android {
     namespace 'ioio.lib.accessory'
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
     }
 }
 

diff --git a/...droidAccessory/src/main/java/ioio/lib/android/accessory/AccessoryConnectionBootstrap.java b/...droidAccessory/src/main/java/ioio/lib/android/accessory/AccessoryConnectionBootstrap.java
@@ -47,6 +47,7 @@
 import java.io.OutputStream;
 import java.util.Collection;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -267,9 +268,16 @@ private boolean tryOpen() {
         }
     }
 
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
     private void registerReceiver() {
         IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
-        activity_.registerReceiver(this, filter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                activity_.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED);
+            } else
+                activity_.registerReceiver(this, filter);
+        } else
+            activity_.registerReceiver(this, filter);
     }
 
     private void unregisterReceiver() {

diff --git a/IOIOLibAndroidBluetooth/build.gradle b/IOIOLibAndroidBluetooth/build.gradle
@@ -7,8 +7,8 @@ android {
     namespace 'ioio.lib.bluetooth'
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
     }
 }
 

diff --git a/IOIOLibAndroidDevice/build.gradle b/IOIOLibAndroidDevice/build.gradle
@@ -7,8 +7,8 @@ android {
     namespace 'ioio.lib.android.device'
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
     }
 }
 

diff --git a/IOIOLibAndroidDevice/src/main/java/ioio/lib/android/device/DeviceConnectionBootstrap.java b/IOIOLibAndroidDevice/src/main/java/ioio/lib/android/device/DeviceConnectionBootstrap.java
@@ -42,6 +42,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -484,11 +485,18 @@ private void checkPermission() {
         }
     }
 
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
     private void registerReceiver() {
         IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
         filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
         filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
-        activity_.registerReceiver(this, filter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                activity_.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED);
+            } else
+                activity_.registerReceiver(this, filter);
+        } else
+            activity_.registerReceiver(this, filter);
     }
 
     private void unregisterReceiver() {

diff --git a/applications/HelloIOIO/build.gradle b/applications/HelloIOIO/build.gradle
@@ -6,8 +6,8 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/HelloIOIOService/build.gradle b/applications/HelloIOIOService/build.gradle
@@ -4,8 +4,8 @@ android {
     namespace 'ioio.examples.hello_service'
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/HolidayIOIO/build.gradle b/applications/HolidayIOIO/build.gradle
@@ -5,8 +5,8 @@ android {
     namespace "ioio.examples.holiday"
     defaultConfig {
         minSdkVersion 21
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/IOIOConnectionTesterAndroid/build.gradle b/applications/IOIOConnectionTesterAndroid/build.gradle
@@ -4,8 +4,8 @@ android {
     namespace "ioio.connection_tester"
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/IOIOManager/build.gradle b/applications/IOIOManager/build.gradle
@@ -5,8 +5,8 @@ android {
     namespace "ioio.manager"
     defaultConfig {
         minSdkVersion 21
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/IOIOSimpleApp/build.gradle b/applications/IOIOSimpleApp/build.gradle
@@ -5,8 +5,8 @@ android {
     namespace "ioio.examples.simple"
     defaultConfig {
         minSdkVersion 21
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/IOIOTestBed/build.gradle b/applications/IOIOTestBed/build.gradle
@@ -4,8 +4,8 @@ android {
     namespace "ioio.test_bed"
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/IOIOTortureTest/build.gradle b/applications/IOIOTortureTest/build.gradle
@@ -4,8 +4,8 @@ android {
     namespace "ioio.tests.torture"
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()

diff --git a/applications/ShoeBot/build.gradle b/applications/ShoeBot/build.gradle
@@ -4,8 +4,8 @@ android {
     namespace "ioio.applications.shoebot"
     defaultConfig {
         minSdkVersion 14
-        compileSdk 33
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
 
         versionCode getGitCommitCount()
         versionName getTag()