Skip to content

Commit 1468e9f

Browse files
authored
Merge pull request #17153 from wordpress-mobile/issue/16068-android-12-update-target-sdk
Updates: target sdk to 31
2 parents 4868687 + 6814ccf commit 1468e9f

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
21.0
44
-----
5+
* [***] [internal] Updates the target sdk to 31 - Android 12 [https://github.com/wordpress-mobile/WordPress-Android/pull/17153]
56
* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
67
* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
78
* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]

WordPress/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ dependencies {
355355

356356
implementation 'com.android.volley:volley:1.1.1'
357357
implementation 'com.google.firebase:firebase-messaging:21.1.0'
358-
implementation 'com.google.android.gms:play-services-auth:18.1.0'
358+
implementation 'com.google.android.gms:play-services-auth:20.3.0'
359359
implementation 'com.android.installreferrer:installreferrer:2.2'
360360
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
361361
implementation 'org.greenrobot:eventbus:3.3.1'

WordPress/src/jetpack/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:tools="http://schemas.android.com/tools">
44
<application>
55
<!-- Deep Linking Activity -->
6-
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity">
6+
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity"
7+
android:exported="true">
78
<intent-filter android:autoVerify="true">
89
<action android:name="android.intent.action.VIEW" />
910

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ plugins {
1010
}
1111

1212
ext {
13-
wordPressUtilsVersion = '2.7.0'
14-
wordPressLoginVersion = '0.19.0'
15-
aztecVersion = 'v1.6.0'
16-
gutenbergMobileVersion = 'v1.83.0'
17-
storiesVersion = '1.4.0'
18-
aboutAutomatticVersion = '0.0.7'
13+
wordPressUtilsVersion = 'trunk-bc2b41b8adbd28462209bdd654cde074a36a4c0a'
14+
wordPressLoginVersion = 'trunk-86258aa940fe32e0d4bfd0a91fe147c80845c19b'
15+
aztecVersion = 'v1.6.2'
16+
gutenbergMobileVersion = 'v1.84.0-alpha1'
17+
storiesVersion = 'trunk-4926f0d5d34adf6a63bd67586a7e56420caa43da'
18+
aboutAutomatticVersion = 'trunk-6f46a8aa2abbfa28aa2c65f6b66969abdcf3e8c2'
1919

2020
minSdkVersion = 24
2121
compileSdkVersion = 31
22-
targetSdkVersion = 30
22+
targetSdkVersion = 31
2323

2424
coroutinesVersion = '1.5.2'
2525
androidxWorkVersion = "2.7.0"
2626

27-
fluxCVersion = '1.55.0'
27+
fluxCVersion = 'trunk-065315b4d0a57112dfe8a37d379431735063bc82'
2828

2929
appCompatVersion = '1.0.2'
3030
androidxCoreVersion = '1.3.2'

0 commit comments

Comments
 (0)