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

Merge Release/11.6 into master #9050

Merged
merged 4 commits into from
Jan 22, 2019
Merged

Merge Release/11.6 into master #9050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45d14e7
Don't use React Native's version of okhttp3
jtreanor Jan 22, 2019
087e98f
Merge pull request #9040 from wordpress-mobile/okhttp-conflict
aforcier Jan 22, 2019
f10129c
11.6-rc-4 / 670 version bump
jtreanor Jan 22, 2019
ef0e223
Update release notes
jtreanor Jan 22, 2019
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
4 changes: 2 additions & 2 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ android {

defaultConfig {
applicationId "org.wordpress.android"
versionName "11.6-rc-3"
versionCode 668
versionName "11.6-rc-4"
versionCode 670
minSdkVersion 21
targetSdkVersion 26

Expand Down
2 changes: 1 addition & 1 deletion WordPress/metadata/PlayStoreStrings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ msgid ""
"* The Notifications list layout is more readable, as is the Me tab on tablets and large devices.\n"
"* New privacy settings let you remove of geolocation from uploaded images.\n"
"* Better messaging when there is no data to show in the stats screen adds clarity.\n"
"* There was an issue where only admins of self-hosted sites could update their password. Now all users can.\n"
"* There was an issue where some users of self-hosted sites couldn’t update their password. Now all users can.\n"
msgstr ""

msgctxt "release_note_115"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/metadata/release_notes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
* The Notifications list layout is more readable, as is the Me tab on tablets and large devices.
* New privacy settings let you remove of geolocation from uploaded images.
* Better messaging when there is no data to show in the stats screen adds clarity.
* There was an issue where only admins of self-hosted sites could update their password. Now all users can.
* There was an issue where some users of self-hosted sites couldn’t update their password. Now all users can.
10 changes: 8 additions & 2 deletions libs/editor/WordPressEditor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,15 @@ dependencies {
api ('com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:v1.3.14')

if (rootProject.ext.buildGutenbergFromSource) {
implementation project(':react-native-gutenberg-bridge')
implementation (project(':react-native-gutenberg-bridge')) {
exclude group: 'com.squareup.okhttp3'
}
} else {
implementation (waitJitpack('com.github.wordpress-mobile', 'gutenberg-mobile', submoduleGitHash('../../../', 'libs/gutenberg-mobile')))
implementation (waitJitpack('com.github.wordpress-mobile', 'gutenberg-mobile', submoduleGitHash('../../../', 'libs/gutenberg-mobile'))) {
// Inheriting RN's okhttp version can interfere with FluxC SSL handling
// See https://github.com/wordpress-mobile/WordPress-Android/issues/9032 and https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919
exclude group: 'com.squareup.okhttp3'
}
}

// Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)
Expand Down