Bump to Android SDK 33 (#379)

jperedadnr · web-flow · commit f26c5d0f3143 · 2024-03-26T09:57:52.000+01:00
* Bump to Android SDK 33

* Add Post_notification permission to Local and PushNotifications
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/modules/local-notifications/src/main/native/android/dalvik/DalvikLocalNotificationsService.java b/modules/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/modules/push-notifications/src/main/native/android/dalvik/DalvikPushNotificationsService.java b/modules/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
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`google()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:7.3.0'`
	`7`	`+ classpath 'com.android.tools.build:gradle:8.1.1'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,19 @@ android {`
`4`	`4`
`5`	`5`	`namespace 'com.gluonhq.helloandroid'`
`6`	`6`
`7`		`- compileSdkVersion 31`
	`7`	`+ compileSdkVersion 33`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`minSdkVersion 21`
`11`		`- targetSdkVersion 31`
	`11`	`+ targetSdkVersion 33`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`compileOnly fileTree(dir: '../libs', include: '*.jar')`
`16`	`16`	`}`
`17`	`17`
`18`		`- afterEvaluate {`
`19`		`- generateDebugBuildConfig.enabled = false`
	`18`	`+ buildFeatures {`
	`19`	`+ buildConfig = false`
	`20`	`+ resValues = false`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@ android {`
`4`	`4`
`5`	`5`	`namespace 'com.gluonhq.helloandroid'`
`6`	`6`
`7`		`- compileSdkVersion 31`
	`7`	`+ compileSdkVersion 33`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`minSdkVersion 21`
`11`		`- targetSdkVersion 31`
	`11`	`+ targetSdkVersion 33`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`compileOptions {`
`@@ -22,7 +22,8 @@ android {`
`22`	`22`	`implementation 'de.javagl:obj:0.3.0'`
`23`	`23`	`}`
`24`	`24`
`25`		`- afterEvaluate {`
`26`		`- generateDebugBuildConfig.enabled = false`
	`25`	`+ buildFeatures {`
	`26`	`+ buildConfig = false`
	`27`	`+ resValues = false`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,20 @@ android {`
`4`	`4`
`5`	`5`	`namespace 'com.gluonhq.helloandroid'`
`6`	`6`
`7`		`- compileSdkVersion 31`
	`7`	`+ compileSdkVersion 33`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`minSdkVersion 21`
`11`		`- targetSdkVersion 31`
	`11`	`+ targetSdkVersion 33`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`compileOnly fileTree(dir: '../libs', include: '*.jar')`
`16`	`16`	`implementation 'com.google.zxing:core:3.4.1'`
`17`	`17`	`}`
`18`	`18`
`19`		`- afterEvaluate {`
`20`		`- generateDebugBuildConfig.enabled = false`
	`19`	`+ buildFeatures {`
	`20`	`+ buildConfig = false`
	`21`	`+ resValues = false`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,16 @@ android {`
`4`	`4`
`5`	`5`	`namespace 'com.gluonhq.helloandroid'`
`6`	`6`
`7`		`- compileSdkVersion 31`
	`7`	`+ compileSdkVersion 33`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`minSdkVersion 21`
`11`		`- targetSdkVersion 31`
	`11`	`+ targetSdkVersion 33`
`12`	`12`	`}`
`13`	`13`
`14`		`- afterEvaluate {`
`15`		`- generateDebugBuildConfig.enabled = false`
	`14`	`+ buildFeatures {`
	`15`	`+ buildConfig = false`
	`16`	`+ resValues = false`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`}`