修改compileSdkVersion和targetSdkVersion为31

tencentyun · May 22, 2024 · a56b4a2 · a56b4a2
1 parent 9f343ae
commit a56b4a2
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 23 deletions.
diff --git a/explorer/device-android-demo/build.gradle b/explorer/device-android-demo/build.gradle
@@ -8,12 +8,12 @@ rootProject.ext.configPath = "./src/main/assets/app-config.json"
 apply from: "../../parse_json.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
     defaultConfig {
         applicationId "com.tencent.iot.explorer.device.android.app"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 1
         versionName rootProject.ext.sdk.sdkdemoVersion
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/explorer/explorer-device-android/build.gradle b/explorer/explorer-device-android/build.gradle
@@ -6,12 +6,12 @@ apply plugin: 'kotlin-android-extensions'
 
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/explorer/explorer-device-broadcast/build.gradle b/explorer/explorer-device-broadcast/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/explorer/explorer-device-central/build.gradle b/explorer/explorer-device-central/build.gradle
@@ -7,12 +7,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/explorer/explorer-device-face/build.gradle b/explorer/explorer-device-face/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/explorer/explorer-device-rtc/build.gradle b/explorer/explorer-device-rtc/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/explorer/explorer-device-tme/build.gradle b/explorer/explorer-device-tme/build.gradle
@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/explorer/explorer-device-video/build.gradle b/explorer/explorer-device-video/build.gradle
@@ -7,12 +7,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.kezong.fat-aar'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/explorer/explorer-media-common/build.gradle b/explorer/explorer-media-common/build.gradle
@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion '26.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/hub/hub-android-demo/build.gradle b/hub/hub-android-demo/build.gradle
@@ -5,12 +5,12 @@ rootProject.ext.configPath = "./src/main/assets/app-config.json"
 apply from: "../../parse_json.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.0"
     defaultConfig {
         applicationId "com.tencent.iot.hub.device.android.app"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName rootProject.ext.sdk.sdkdemoVersion
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/hub/hub-device-android/build.gradle b/hub/hub-device-android/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'signing'
 
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     buildToolsVersion "26.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 31
         versionCode 2
         versionName "1.1"
 

diff --git a/...android/src/main/java/com/tencent/iot/hub/device/android/core/mqtt/TXAlarmPingSender.java b/...android/src/main/java/com/tencent/iot/hub/device/android/core/mqtt/TXAlarmPingSender.java
@@ -67,7 +67,11 @@ public void start() {
             mContext.registerReceiver(mAlarmReceiver, new IntentFilter(action));
         }
 
-        pendingIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(action), PendingIntent.FLAG_UPDATE_CURRENT);
+        int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            flags |= PendingIntent.FLAG_IMMUTABLE;
+        }
+        pendingIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(action), flags);
 
         schedule(mComms.getKeepAlive());
         hasStarted = true;