From 45d14e78ab81cde879a79e8fd7bf26ad5538f487 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 22 Jan 2019 11:43:55 +0000 Subject: [PATCH 1/3] Don't use React Native's version of okhttp3 --- libs/editor/WordPressEditor/build.gradle | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index f15a05cacf05..56d2aea985e2 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -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) From f10129cf56b110b432a44666ac52cf40895f25a3 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 22 Jan 2019 14:37:57 +0000 Subject: [PATCH 2/3] 11.6-rc-4 / 670 version bump --- WordPress/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 03662be83618..4e0f79d3a300 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -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 From ef0e22398631e429b77587d418f0500b022363c1 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 22 Jan 2019 16:34:34 +0000 Subject: [PATCH 3/3] Update release notes --- WordPress/metadata/PlayStoreStrings.po | 2 +- WordPress/metadata/release_notes.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po index d02c96febfcc..ee6c3c7da80a 100644 --- a/WordPress/metadata/PlayStoreStrings.po +++ b/WordPress/metadata/PlayStoreStrings.po @@ -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" diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index 22b89bcf6ecb..cd6412605aef 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -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.