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.

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

[Gutenberg] - React Native 0.69.4 Upgrade #17066

Merged
merged 38 commits into from
Dec 7, 2022
Merged

Conversation

geriux
Copy link
Contributor

@geriux geriux commented Aug 22, 2022

This PR adds changes to support the React Native 0.69.4 upgrade.

It removes the reference to hermes-mirror since it's no longer used.

It also adds several implementations in libs/editor/build.gradle since they're not included with the React Native and Hermes binaries.

Related PRs

Feature branch

Android integration

iOS integration

To test:

CI checks should pass, as well as checking the editor opens correctly with the builds from this PR.

Regression Notes

  1. Potential unintended areas of impact
    Editor

  2. What I did to test those areas of impact (or what existing automated tests I relied on)
    Manual testing, CI tests.

  3. What automated tests I added (or what prevented me from doing so)
    None as there is no added functionality

PR submission checklist:

  • I have completed the Regression Notes.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

…es and react native binaries. It also comments out excluding the hermes debug libraries
WordPress/build.gradle Outdated Show resolved Hide resolved
@wpmobilebot
Copy link
Contributor

wpmobilebot commented Sep 21, 2022

WordPress📲 You can test these changes on WordPress by downloading wordpress-installable-build-pr17066-24eb8f5.apk
💡 Scan this QR code with your Android phone to download and install the APK directly on it.
AppWordPress
Build FlavorJalapeno
Build TypeDebug
Commit24eb8f5
Note: This installable build uses the JalapenoDebug build flavor, and does not support Google Login.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Sep 21, 2022

Jetpack📲 You can test these changes on Jetpack by downloading jetpack-installable-build-pr17066-24eb8f5.apk
💡 Scan this QR code with your Android phone to download and install the APK directly on it.
AppJetpack
Build FlavorJalapeno
Build TypeDebug
Commit24eb8f5
Note: This installable build uses the JalapenoDebug build flavor, and does not support Google Login.

@geriux
Copy link
Contributor Author

geriux commented Oct 20, 2022

@fluiddot Android CI issues are now solved after 5dad8d5

@derekblank derekblank marked this pull request as ready for review December 5, 2022 05:55
Copy link
Contributor

@fluiddot fluiddot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@derekblank I reviewed the PR and noticed an issue in the latest code changes that might be the culprit of the CI checks nos passing, although it's hard to tell based on the error output. Before proceeding, let's try to solve them and check if the CI checks pass.

build.gradle Outdated Show resolved Hide resolved
@wpmobilebot
Copy link
Contributor

Found 1 violations:

The PR caused the following dependency changes:

 +--- project :libs:editor
+|    +--- com.facebook.soloader:soloader:{strictly 0.10.4} -> 0.10.4
+|    |    +--- com.facebook.soloader:annotation:0.10.4
+|    |    \--- com.facebook.soloader:nativeloader:0.10.4
+|    +--- com.facebook.fresco:fresco:2.5.0
+|    |    +--- com.facebook.fresco:soloader:2.5.0
+|    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    \--- com.facebook.soloader:soloader:0.10.1 -> 0.10.4 (*)
+|    |    +--- com.facebook.soloader:nativeloader:0.10.1 -> 0.10.4
+|    |    +--- com.facebook.fresco:ui-common:2.5.0
+|    |    |    \--- com.facebook.fresco:fbcore:2.5.0
+|    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    +--- com.facebook.fresco:drawee:2.5.0
+|    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0
+|    |    |    |    +--- com.facebook.soloader:nativeloader:0.10.1 -> 0.10.4
+|    |    |    |    +--- com.facebook.soloader:annotation:0.10.1 -> 0.10.4
+|    |    |    |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|    |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    |    \--- com.facebook.fresco:imagepipeline-base:2.5.0
+|    |    |    |         +--- com.facebook.infer.annotation:infer-annotation:0.18.0
+|    |    |    |         |    +--- com.google.code.findbugs:jsr305:3.0.1 -> 3.0.2
+|    |    |    |         |    \--- org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
+|    |    |    |         +--- com.facebook.soloader:annotation:0.10.1 -> 0.10.4
+|    |    |    |         +--- com.parse.bolts:bolts-tasks:1.4.0
+|    |    |    |         \--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0
+|    |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    |    \--- com.facebook.soloader:soloader:0.10.1 -> 0.10.4 (*)
+|    |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0
+|    |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    |    \--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    |    +--- com.facebook.fresco:memory-type-native:2.5.0
+|    |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|    |    |    |    \--- com.facebook.soloader:nativeloader:0.10.1 -> 0.10.4
+|    |    |    +--- com.facebook.fresco:memory-type-java:2.5.0
+|    |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    |    |    \--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|    |    |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
+|    |    |    \--- com.facebook.fresco:middleware:2.5.0
+|    |    |         +--- com.facebook.fresco:fbcore:2.5.0
+|    |    |         \--- com.facebook.fresco:ui-common:2.5.0 (*)
+|    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
+|    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
+|    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
+|    |    +--- com.facebook.fresco:nativeimagefilters:2.5.0
+|    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|    |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
+|    |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
+|    |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
+|    |    |    +--- com.facebook.soloader:nativeloader:0.10.1 -> 0.10.4
+|    |    |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|    |    |    \--- com.facebook.fresco:fbcore:2.5.0
+|    |    \--- com.facebook.fresco:nativeimagetranscoder:2.5.0
+|    |         +--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
+|    |         +--- com.facebook.soloader:nativeloader:0.10.1 -> 0.10.4
+|    |         +--- com.parse.bolts:bolts-tasks:1.4.0
+|    |         \--- com.facebook.fresco:fbcore:2.5.0
+|    +--- com.facebook.fresco:imagepipeline-okhttp3:2.5.0
+|    |    +--- com.facebook.fresco:fbcore:2.5.0
+|    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
+|    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
+|    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
+|    |    \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.2 (*)
+|    +--- com.facebook.fbjni:fbjni:0.2.2
+|    |    \--- com.facebook.soloader:nativeloader:0.10.1 -> 0.10.4
+|    +--- com.facebook.react:hermes-engine:0.69.4
+|    +--- com.facebook.react:react-native:0.69.4
-|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.85.1
-|         +--- com.facebook.fresco:animated-gif:2.0.0
-|         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.1
-|         |    |    +--- com.facebook.soloader:annotation:0.10.1
-|         |    |    \--- com.facebook.soloader:nativeloader:0.10.1
-|         |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |    \--- com.facebook.fresco:animated-base:2.0.0
-|         |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0
-|         |         |    +--- com.facebook.infer.annotation:infer-annotation:0.18.0
-|         |         |    |    +--- com.google.code.findbugs:jsr305:3.0.1 -> 3.0.2
-|         |         |    |    \--- org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
-|         |         |    +--- com.facebook.soloader:annotation:0.10.1
-|         |         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |         |    \--- com.facebook.fresco:fbcore:2.5.0
-|         |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0
-|         |         |    +--- com.facebook.soloader:nativeloader:0.10.1
-|         |         |    +--- com.facebook.soloader:annotation:0.10.1
-|         |         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |         |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    \--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
-|         |         +--- com.facebook.fresco:animated-drawable:2.0.0
-|         |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
-|         |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0
-|         |         |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    \--- com.facebook.soloader:soloader:0.10.1 (*)
-|         |         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    \--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |         |    |    |    \--- com.facebook.soloader:nativeloader:0.10.1
-|         |         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    |    \--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |         |    |    +--- com.facebook.fresco:ui-common:2.5.0
-|         |         |    |    |    \--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    \--- com.facebook.fresco:middleware:2.5.0
-|         |         |    |         +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |         \--- com.facebook.fresco:ui-common:2.5.0 (*)
-|         |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |         \--- com.parse.bolts:bolts-tasks:1.4.0
-|         +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-|         +--- com.facebook.react:react-native:0.66.2
-|         |    +--- com.facebook.infer.annotation:infer-annotation:0.18.0 (*)
-|         |    +--- com.facebook.yoga:proguard-annotations:1.19.0
-|         |    +--- javax.inject:javax.inject:1
-|         |    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
-|         |    +--- androidx.autofill:autofill:1.1.0
-|         |    |    \--- androidx.core:core:1.1.0 -> 1.7.0 (*)
-|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-|         |    +--- com.facebook.fresco:fresco:2.5.0
-|         |    |    +--- com.facebook.fresco:soloader:2.5.0
-|         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    |    \--- com.facebook.soloader:soloader:0.10.1 (*)
-|         |    |    +--- com.facebook.soloader:nativeloader:0.10.1
-|         |    |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    +--- com.facebook.fresco:drawee:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:nativeimagefilters:2.5.0
-|         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
-|         |    |    |    +--- com.facebook.soloader:nativeloader:0.10.1
-|         |    |    |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    |    |    \--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    \--- com.facebook.fresco:nativeimagetranscoder:2.5.0
-|         |    |         +--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
-|         |    |         +--- com.facebook.soloader:nativeloader:0.10.1
-|         |    |         +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    |         \--- com.facebook.fresco:fbcore:2.5.0
-|         |    +--- com.facebook.fresco:imagepipeline-okhttp3:2.5.0
-|         |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
-|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.2 (*)
-|         |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
-|         |    +--- com.facebook.soloader:soloader:0.10.1 (*)
-|         |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    +--- com.squareup.okhttp3:okhttp:4.9.1 -> 4.9.2 (*)
-|         |    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.1 -> 4.9.2
-|         |    |    +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
-|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
-|         |    +--- com.squareup.okio:okio:2.9.0 -> 2.10.0 (*)
-|         |    \--- com.facebook.fbjni:fbjni-java-only:0.2.2
-|         |         \--- com.facebook.soloader:nativeloader:0.10.1
-|         +--- org.wordpress-mobile:react-native-svg:9.13.6
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-4
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- com.google.android.exoplayer:exoplayer:2.13.3
-|         |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
-|         |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    |    \--- com.google.guava:guava:27.1-android
-|         |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
-|         |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
-|         |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
-|         |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |         +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-|         |    |         \--- androidx.media:media:1.2.1 (*)
-|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
-|         |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
-|         |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
-|         |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.9.2 (*)
-|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.9.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-3
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-3
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-get-random-values:1.4.0
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-masked-view:0.2.6
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-screens:2.9.0
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.1 (*)
-|         |    +--- androidx.fragment:fragment:1.2.1 -> 1.4.1 (*)
-|         |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
-|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-|         |    \--- com.google.android.material:material:1.1.0 -> 1.6.0-alpha01 (*)
-|         +--- org.wordpress-mobile:react-native-safe-area-context:3.2.0
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-4
-|         +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-3
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
-|         +--- org.wordpress-mobile:react-native-webview:11.6.2
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
-|         +--- org.wordpress-mobile:react-native-clipboard:1.9.0
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-fast-image:8.5.11
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- com.github.bumptech.glide:glide:4.12.0
-|         |    |    +--- com.github.bumptech.glide:gifdecoder:4.12.0
-|         |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-|         |    |    +--- com.github.bumptech.glide:disklrucache:4.12.0
-|         |    |    +--- com.github.bumptech.glide:annotations:4.12.0
-|         |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.4.1 (*)
-|         |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
-|         |    |    \--- androidx.exifinterface:exifinterface:1.2.0 -> 1.3.3 (*)
-|         |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
-|         |         +--- com.github.bumptech.glide:glide:4.12.0 (*)
-|         |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.9.2 (*)
-|         |         \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-|         +--- com.github.wordpress-mobile:react-native-gesture-handler:2.3.2-wp-2
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.4.1-wp-4
-|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
-|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.7.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.6.10 (*)
-|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.85.1
-|         |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-|         |    +--- androidx.gridlayout:gridlayout:1.0.0
-|         |    |    +--- androidx.core:core:1.0.0 -> 1.7.0 (*)
-|         |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
-|         |    +--- androidx.cardview:cardview:1.0.0 (*)
-|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
-|         |    +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- org.wordpress:aztec:v1.6.2 (*)
-|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.6.2 (*)
-|         |    +--- org.wordpress.aztec:wordpress-comments:v1.6.2 (*)
-|         |    +--- org.wordpress.aztec:glide-loader:v1.6.2
-|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
-|         |    |    +--- org.wordpress:aztec:v1.6.2 (*)
-|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
-|         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
-|         \--- org.wordpress-mobile:hermes-release-mirror:0.66.2
+|    +--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.86.0-alpha1
+|         +--- com.facebook.fresco:animated-gif:2.0.0
+|         |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|         |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.4 (*)
+|         |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+|         |    \--- com.facebook.fresco:animated-base:2.0.0
+|         |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+|         |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0 (*)
+|         |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
+|         |         +--- com.facebook.fresco:animated-drawable:2.0.0
+|         |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
+|         |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0 (*)
+|         |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+|         |         \--- com.parse.bolts:bolts-tasks:1.4.0
+|         +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+|         +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-5
+|         |    +--- com.google.android.exoplayer:exoplayer:2.13.3
+|         |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
+|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
+|         |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    |    \--- com.google.guava:guava:27.1-android
+|         |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
+|         |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+|         |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
+|         |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+|         |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
+|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
+|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
+|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
+|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
+|         |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |         +--- androidx.recyclerview:recyclerview:1.1.0 (*)
+|         |    |         \--- androidx.media:media:1.2.1 (*)
+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
+|         |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
+|         |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
+|         |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.9.2 (*)
+|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.9.2 (*)
+|         +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-3
+|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-3
+|         +--- com.github.wordpress-mobile:react-native-reanimated:2.9.1-wp-2
+|         +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-3
+|         |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
+|         +--- com.github.wordpress-mobile:react-native-gesture-handler:2.3.2-wp-2
+|         |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.9.1-wp-2
+|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
+|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.7.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.6.10 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-get-random-values:1.4.0
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-safe-area-context:3.2.0
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-screens:2.9.0
+|         |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.1 (*)
+|         |    +--- androidx.fragment:fragment:1.2.1 -> 1.4.1 (*)
+|         |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
+|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
+|         |    \--- com.google.android.material:material:1.1.0 -> 1.6.0-alpha01 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-svg:9.13.6
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-webview:11.6.2
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-masked-view:0.2.6
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-clipboard:1.9.0
+|         +--- org.wordpress-mobile.react-native-libraries.v1:react-native-fast-image:8.5.11
+|         |    +--- com.github.bumptech.glide:glide:4.12.0
+|         |    |    +--- com.github.bumptech.glide:gifdecoder:4.12.0
+|         |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+|         |    |    +--- com.github.bumptech.glide:disklrucache:4.12.0
+|         |    |    +--- com.github.bumptech.glide:annotations:4.12.0
+|         |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.4.1 (*)
+|         |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
+|         |    |    \--- androidx.exifinterface:exifinterface:1.2.0 -> 1.3.3 (*)
+|         |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
+|         |         +--- com.github.bumptech.glide:glide:4.12.0 (*)
+|         |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.9.2 (*)
+|         |         \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.86.0-alpha1
+|         |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+|         |    +--- androidx.gridlayout:gridlayout:1.0.0
+|         |    |    +--- androidx.core:core:1.0.0 -> 1.7.0 (*)
+|         |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
+|         |    +--- androidx.cardview:cardview:1.0.0 (*)
+|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
+|         |    +--- androidx.recyclerview:recyclerview:1.1.0 (*)
+|         |    +--- org.wordpress:aztec:v1.6.2 (*)
+|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.6.2 (*)
+|         |    +--- org.wordpress.aztec:wordpress-comments:v1.6.2 (*)
+|         |    +--- org.wordpress.aztec:glide-loader:v1.6.2
+|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
+|         |    |    +--- org.wordpress:aztec:v1.6.2 (*)
+|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
+|    \--- org.jsoup:jsoup:1.10.3 -> 1.11.3
 +--- org.wordpress:fluxc:{strictly 2.6.0} -> 2.6.0
-|    \--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
+|    \--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
+|         +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
 \--- com.automattic:about:1.0.0
      \--- androidx.compose.ui:ui:1.0.5 -> 1.1.1
-          \--- androidx.autofill:autofill:1.0.0 -> 1.1.0 (*)
+          \--- androidx.autofill:autofill:1.0.0
+               \--- androidx.core:core:1.1.0 -> 1.7.0 (*)

Please review and act accordingly

@geriux geriux added this to the 21.4 milestone Dec 7, 2022
@geriux
Copy link
Contributor Author

geriux commented Dec 7, 2022

CI checks are now green and the installable build opens the editor correctly.

WordPress/build.gradle Show resolved Hide resolved
Comment on lines +79 to +83
implementation 'com.facebook.fresco:fresco:2.5.0'
implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.5.0'
implementation 'com.facebook.fbjni:fbjni:0.2.2'
implementation 'com.facebook.react:hermes-engine:0.69.4:release@aar'
implementation 'com.facebook.react:react-native:0.69.4:release@aar'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It also adds several implementations in libs/editor/build.gradle since they're not included with the React Native and Hermes binaries.

Are these the libraries not included in the React Native and Hermes binaries? I'm wondering if we'd need to define them here or if they could be part of the libraries required by Gutenberg Mobile, could we have them as dependencies in the react-native-bridge build gradle file?

I noticed that we are also setting the React Native version, is this required? Would be a way to let the Gutenberg Mobile library to define this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we encountered issues with using the debug artifacts for both Hermes and React Native instead of the release ones, when excluding them and including them again some libraries needed to be referenced again.

I'm working on a draft PR as a follow-up to improve these, although to be able to force the release artifacts for all builds like (Jalapeno Debug) which are the builds PRs generate, we will have to keep a few implementations. 😅

Comment on lines +92 to +93
// Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)
implementation "org.jsoup:jsoup:$jsoupVersion"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we haven't updated the Aztec version, so I'm wondering why we need to add this dependency if we didn't have it before 🤔, what changed with the RN upgrade to producing this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is also related for this question.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 @geriux @fluiddot !

I also stumbled upon this just now, that is, while working on the org.jsoup:jsoup dependency update (see here). I just removed this dependency from the libs:editor module (it being unused and all) and the WPAndroid seems to be building/working just fine.

I'm working on a draft PR as a follow-up to improve these, although to be able to force the release artifacts for all builds like (Jalapeno Debug) which are the builds PRs generate, we will have to keep a few implementations. 😅

Should I refrain from removing dependency and ignore this for now, that is, at least until this work above is done? Or maybe it is already done but I can't connect the dots just yet, not sure? 🤔

Thanking you in advance for your advise here! 🙏

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and the WPAndroid seems to be building/working just fine.

Does the editor open correctly after this change?

Copy link
Contributor

@ParaskP7 ParaskP7 Mar 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 @geriux and thanks for the reply!

Does the editor open correctly after this change?

Yes, I am able to open the editor correctly after this change (both the Classic and Block editor). Unless of course, I am missing something obvious here... 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: I just pushed this removal commit, feel free to test this PR yourself and let me know if everything works as you would have expected.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the dependency org.jsoup:jsoup is used by Aztec-Android (reference).

In fact, we set the version of that dependency here in Gutenberg. I'm not sure whether it can be removed or not, in any case, this could be tested by checking if the editor can be built and works as expected.

Copy link
Contributor

@fluiddot fluiddot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested the installable build and the editor worked as expected. LGTM 🎊 !

Regarding the comments I posted in my last review, I think we should address them. However, I agree that shouldn't block the merge, hence we could tackle them in a follow-up PR if needed. Thanks!

@geriux geriux merged commit cc7318c into trunk Dec 7, 2022
@geriux geriux deleted the gutenberg/react-native-0.69 branch December 7, 2022 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants