Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8585f48
Updates: target sdk to 31
AjeshRPai Sep 12, 2022
8eaa52b
Merge branch 'trunk' into issue/16068-android-12-update-target-sdk
AjeshRPai Sep 15, 2022
be223fb
Updates: the authentication library
AjeshRPai Sep 15, 2022
0fe7f5c
Updates: Deeplink receiver activity exported attribute
AjeshRPai Sep 15, 2022
e62f406
Merge branch 'trunk' into issue/16068-android-12-update-target-sdk
AjeshRPai Sep 19, 2022
d94daa4
Updates: Release notes for visibility in beta testing
AjeshRPai Sep 22, 2022
258c486
Merge branch 'trunk' into issue/16068-android-12-update-target-sdk
AjeshRPai Sep 23, 2022
27589c7
Merge branch 'trunk' into issue/16068-android-12-update-target-sdk
AjeshRPai Oct 3, 2022
e488388
Merge branch 'trunk' into issue/16068-android-12-update-target-sdk
AjeshRPai Oct 3, 2022
ddda61c
Updates: library versions to Android 12 compatible one
AjeshRPai Oct 3, 2022
94310c7
Update login library hash
zwarm Oct 3, 2022
8c36a31
Update FluxC version
zwarm Oct 3, 2022
5f07873
Updates: Gutenberg library version
AjeshRPai Oct 5, 2022
97244de
Update Gutenberg Mobile reference
fluiddot Oct 5, 2022
e361082
Update Gutenberg Mobile reference (fix Aztec issue)
fluiddot Oct 7, 2022
03619c0
Merge branch 'trunk' into issue/16068-android-12-update-target-sdk
AjeshRPai Oct 13, 2022
589053c
Updates: Library versions with Android 12 compatible
AjeshRPai Oct 13, 2022
2b51b88
Updates: RELEASE-NOTES.txt after merge
AjeshRPai Oct 13, 2022
6a2cfee
Fixes: typo in library versions
AjeshRPai Oct 13, 2022
6814ccf
Update Gutenberg Mobile reference to alpha version
fluiddot Oct 13, 2022
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

21.0
-----
* [***] [internal] Updates the target sdk to 31 - Android 12 [https://github.com/wordpress-mobile/WordPress-Android/pull/17153]
* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
Expand Down
2 changes: 1 addition & 1 deletion WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ dependencies {

implementation 'com.android.volley:volley:1.1.1'
implementation 'com.google.firebase:firebase-messaging:21.1.0'
implementation 'com.google.android.gms:play-services-auth:18.1.0'
implementation 'com.google.android.gms:play-services-auth:20.3.0'
implementation 'com.android.installreferrer:installreferrer:2.2'
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
implementation 'org.greenrobot:eventbus:3.3.1'
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/jetpack/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools">
<application>
<!-- Deep Linking Activity -->
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity">
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity"
android:exported="true">
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />

Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ plugins {
}

ext {
wordPressUtilsVersion = '2.7.0'
wordPressLoginVersion = '0.19.0'
aztecVersion = 'v1.6.0'
gutenbergMobileVersion = 'v1.83.0'
storiesVersion = '1.4.0'
aboutAutomatticVersion = '0.0.7'
wordPressUtilsVersion = 'trunk-bc2b41b8adbd28462209bdd654cde074a36a4c0a'
wordPressLoginVersion = 'trunk-86258aa940fe32e0d4bfd0a91fe147c80845c19b'
aztecVersion = 'v1.6.2'
gutenbergMobileVersion = 'v1.84.0-alpha1'
storiesVersion = 'trunk-4926f0d5d34adf6a63bd67586a7e56420caa43da'
aboutAutomatticVersion = 'trunk-6f46a8aa2abbfa28aa2c65f6b66969abdcf3e8c2'

minSdkVersion = 24
compileSdkVersion = 31
targetSdkVersion = 30
targetSdkVersion = 31

coroutinesVersion = '1.5.2'
androidxWorkVersion = "2.7.0"

fluxCVersion = '1.55.0'
fluxCVersion = 'trunk-065315b4d0a57112dfe8a37d379431735063bc82'

appCompatVersion = '1.0.2'
androidxCoreVersion = '1.3.2'
Expand Down