Merge branch 'update-to-compilesdk-targetsdk-34-droid-472'

mullvad · Nov 21, 2023 · e98cece · e98cece
2 parents 57085fc + 850b405
commit e98cece
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 207 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <!-- https://developer.android.com/guide/components/fg-service-types#system-exempted -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-feature android:name="android.hardware.touchscreen"
                   android:required="false" />
     <uses-feature android:name="android.hardware.faketouch"
@@ -49,11 +51,17 @@
             however as it's protected by the bind vpn permission
             (android.permission.BIND_VPN_SERVICE) it's protected against third party apps/services.
         -->
+        <!--
+            foregroundServiceType="systemExempted" is required in Android 14+
+            https://developer.android.com/guide/components/fg-service-types#system-exempted
+            -->
         <service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
                  android:exported="true"
                  android:permission="android.permission.BIND_VPN_SERVICE"
                  android:process=":mullvadvpn_daemon"
-                 android:stopWithTask="false">
+                 android:stopWithTask="false"
+                 android:foregroundServiceType="systemExempted"
+                 tools:ignore="ForegroundServicePermission">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>

diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -14,10 +14,10 @@ object Versions {
     const val billingClient = "6.0.1"
 
     object Android {
-        const val compileSdkVersion = 33
+        const val compileSdkVersion = 34
         const val material = "1.9.0"
         const val minSdkVersion = 26
-        const val targetSdkVersion = 33
+        const val targetSdkVersion = 34
         const val volley = "1.2.1"
     }
 
@@ -51,7 +51,7 @@ object Versions {
         // The androidAapt plugin version must be in sync with the android plugin version.
         // Required for Gradle metadata verification to work properly, see:
         // https://github.com/gradle/gradle/issues/19228
-        const val android = "8.1.0"
+        const val android = "8.1.4"
         const val androidAapt = "$android-10154469"
         const val playPublisher = "3.8.4"
         const val dependencyCheck = "8.3.1"