Bump to Android SDK 33 (#379)

* Bump to Android SDK 33 * Add Post_notification permission to Local and PushNotifications
gluonhq · Mar 26, 2024 · f26c5d0 · f26c5d0
1 parent 16c743a
commit f26c5d0
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 22 deletions.
diff --git a/gradle/android_project/build.gradle b/gradle/android_project/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
     }
 }
 

diff --git a/gradle/android_project/gradle/wrapper/gradle-wrapper.properties b/gradle/android_project/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
diff --git a/gradle/android_project/library/build.gradle b/gradle/android_project/library/build.gradle
@@ -4,18 +4,19 @@ android {
 
     namespace 'com.gluonhq.helloandroid'
 
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
     dependencies {
         compileOnly fileTree(dir: '../libs', include: '*.jar')
     }
 
-    afterEvaluate {
-        generateDebugBuildConfig.enabled = false
+    buildFeatures {
+        buildConfig = false
+        resValues = false
     }
 }
diff --git a/modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle
@@ -4,11 +4,11 @@ android {
 
     namespace 'com.gluonhq.helloandroid'
 
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
     compileOptions {
@@ -22,7 +22,8 @@ android {
         implementation 'de.javagl:obj:0.3.0'
     }
 
-    afterEvaluate {
-        generateDebugBuildConfig.enabled = false
+    buildFeatures {
+        buildConfig = false
+        resValues = false
     }
 }
diff --git a/modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle
@@ -4,19 +4,20 @@ android {
 
     namespace 'com.gluonhq.helloandroid'
 
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
     dependencies {
         compileOnly fileTree(dir: '../libs', include: '*.jar')
         implementation 'com.google.zxing:core:3.4.1'
     }
 
-    afterEvaluate {
-        generateDebugBuildConfig.enabled = false
+    buildFeatures {
+        buildConfig = false
+        resValues = false
     }
 }
diff --git a/...s/local-notifications/src/main/native/android/dalvik/DalvikLocalNotificationsService.java b/...s/local-notifications/src/main/native/android/dalvik/DalvikLocalNotificationsService.java
@@ -27,6 +27,7 @@
  */
 package com.gluonhq.helloandroid;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.Notification;
@@ -40,6 +41,7 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
+import android.util.Log;
 
 public class DalvikLocalNotificationsService {
 
@@ -50,6 +52,13 @@ public class DalvikLocalNotificationsService {
 
     public DalvikLocalNotificationsService(Activity activity) {
         DalvikLocalNotificationsService.this.activity = activity;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            boolean notificationsEnabled = Util.verifyPermissions(Manifest.permission.POST_NOTIFICATIONS);
+            if (!notificationsEnabled) {
+                Log.v(TAG, "Post notifications disabled. POST_NOTIFICATIONS permission is required");
+            }
+        }
     }
 
     static Activity getActivity() {

diff --git a/modules/local-notifications/src/main/resources/META-INF/substrate/dalvik/AndroidManifest.xml b/modules/local-notifications/src/main/resources/META-INF/substrate/dalvik/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <uses-sdk android:minSdkVersion="21" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <application>
         <activity android:name='com.gluonhq.helloandroid.MainActivity'
                   android:exported="true"

diff --git a/...les/push-notifications/src/main/native/android/dalvik/DalvikPushNotificationsService.java b/...les/push-notifications/src/main/native/android/dalvik/DalvikPushNotificationsService.java
@@ -27,6 +27,7 @@
  */
 package com.gluonhq.helloandroid;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.job.JobInfo;
 import android.app.job.JobScheduler;
@@ -51,6 +52,13 @@ public class DalvikPushNotificationsService {
 
     public DalvikPushNotificationsService(Activity activity) {
         DalvikPushNotificationsService.this.activity = activity;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            boolean notificationsEnabled = Util.verifyPermissions(Manifest.permission.POST_NOTIFICATIONS);
+            if (!notificationsEnabled) {
+                Log.v(TAG, "Post notifications disabled. POST_NOTIFICATIONS permission is required");
+            }
+        }
     }
 
     static Activity getActivity() {

diff --git a/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/AndroidManifest.xml b/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <application>
         <activity android:name='com.gluonhq.helloandroid.MainActivity'
                   android:exported="true"

diff --git a/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle
@@ -4,15 +4,16 @@ android {
 
     namespace 'com.gluonhq.helloandroid'
 
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
-    afterEvaluate {
-        generateDebugBuildConfig.enabled = false
+    buildFeatures {
+        buildConfig = false
+        resValues = false
     }
 
 }

diff --git a/modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle
@@ -4,15 +4,16 @@ android {
 
     namespace 'com.gluonhq.helloandroid'
 
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
     }
 
-    afterEvaluate {
-        generateDebugBuildConfig.enabled = false
+    buildFeatures {
+        buildConfig = false
+        resValues = false
     }
 
 }