Skip to content

Commit

Permalink
Merge pull request #9040 from wordpress-mobile/okhttp-conflict
Browse files Browse the repository at this point in the history
Don't use React Native's version of okhttp3 to fix self signed SSL
  • Loading branch information
aforcier authored Jan 22, 2019
2 parents c5d268f + 45d14e7 commit 087e98f
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions libs/editor/WordPressEditor/build.gradle
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

0 comments on commit 087e98f

Please sign in to comment.