Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AGP & SDK version to 34 #5473

Merged
merged 3 commits into from
Nov 21, 2023
Merged

Update AGP & SDK version to 34 #5473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27bdbc1
Update SDK version
Rawa Nov 21, 2023
9900634
Update gradle verification file
Pururun Nov 21, 2023
850b405
Fix test
Rawa Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions android/buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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"
Expand Down
Loading
Loading