Skip to content

Merge 22.6-rc-2 to trunk#18673

Merged
oguzkocer merged 7 commits intotrunkfrom
release/22.6
Jun 19, 2023
Merged

Merge 22.6-rc-2 to trunk#18673
oguzkocer merged 7 commits intotrunkfrom
release/22.6

Conversation

@oguzkocer
Copy link
Contributor

Includes the fix from #18611.

@oguzkocer oguzkocer added this to the 22.7 milestone Jun 19, 2023
@oguzkocer oguzkocer requested a review from a team June 19, 2023 21:15
@oguzkocer oguzkocer enabled auto-merge June 19, 2023 21:15
@wpmobilebot
Copy link
Contributor

Found 1 violations:

The PR caused the following dependency changes:

 \--- project :libs:editor
-     \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.97.0
-          +--- 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.9.0 (*)
-          +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-6
-          |    +--- com.google.android.exoplayer:exoplayer:2.13.3
-          |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
-          |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.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.6.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.6.0 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.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.6.0 (*)
-          |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
-          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.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.6.0 (*)
-          |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-          |    |         \--- androidx.media:media:1.2.1 (*)
-          |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |    +--- androidx.core:core:1.1.0 -> 1.10.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.6.0 (*)
-          |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.10.0 (*)
-          |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.10.0 (*)
-          +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-4
-          +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
-          +--- com.github.wordpress-mobile:react-native-reanimated:2.9.1-wp-4
-          +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-4
-          |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.6.1 (*)
-          +--- com.github.wordpress-mobile:react-native-gesture-handler:2.3.2-wp-3
-          |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.9.1-wp-4
-          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
-          |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.8.21 (*)
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-get-random-values:1.4.0
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-safe-area-context:3.2.0
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-screens:2.9.0
-          |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
-          |    +--- androidx.fragment:fragment:1.2.1 -> 1.5.7 (*)
-          |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
-          |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-          |    \--- com.google.android.material:material:1.1.0 -> 1.9.0 (*)
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-svg:9.13.6
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-webview:11.26.1
-          |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.8.21 (*)
-          |    \--- androidx.webkit:webkit:1.4.0
-          |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-          |         \--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-masked-view:0.2.6
-          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-clipboard:1.9.0
-          +--- org.wordpress-mobile.react-native-libraries.v2: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.6.0 (*)
-          |    |    +--- com.github.bumptech.glide:disklrucache:4.12.0
-          |    |    +--- com.github.bumptech.glide:annotations:4.12.0
-          |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.5.7 (*)
-          |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
-          |    |    \--- androidx.exifinterface:exifinterface:1.2.0 -> 1.3.6 (*)
-          |    \--- 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.10.0 (*)
-          |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-          +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.97.0
-          |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-          |    +--- androidx.gridlayout:gridlayout:1.0.0
-          |    |    +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
-          |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
-          |    +--- androidx.cardview:cardview:1.0.0 (*)
-          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
-          |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
-          |    +--- org.wordpress:aztec:v1.6.4 (*)
-          |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.6.4 (*)
-          |    +--- org.wordpress.aztec:wordpress-comments:v1.6.4 (*)
-          |    +--- org.wordpress.aztec:glide-loader:v1.6.4
-          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-          |    |    +--- org.wordpress:aztec:v1.6.4 (*)
-          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
-          \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+     \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.97.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.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.9.0 (*)
+          +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-6
+          |    +--- com.google.android.exoplayer:exoplayer:2.13.3
+          |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
+          |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.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.6.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.6.0 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.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.6.0 (*)
+          |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
+          |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.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.6.0 (*)
+          |    |         +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          |    |         \--- androidx.media:media:1.2.1 (*)
+          |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |    +--- androidx.core:core:1.1.0 -> 1.10.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.6.0 (*)
+          |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.10.0 (*)
+          |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.10.0 (*)
+          +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-4
+          +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
+          +--- com.github.wordpress-mobile:react-native-reanimated:2.9.1-wp-4
+          +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-4
+          |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.6.1 (*)
+          +--- com.github.wordpress-mobile:react-native-gesture-handler:2.3.2-wp-3
+          |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.9.1-wp-4
+          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
+          |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.8.21 (*)
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-get-random-values:1.4.0
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-safe-area-context:3.2.0
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-screens:2.9.0
+          |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
+          |    +--- androidx.fragment:fragment:1.2.1 -> 1.5.7 (*)
+          |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
+          |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
+          |    \--- com.google.android.material:material:1.1.0 -> 1.9.0 (*)
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-svg:9.13.6
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-webview:11.26.1
+          |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.8.21 (*)
+          |    \--- androidx.webkit:webkit:1.4.0
+          |         +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+          |         \--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-masked-view:0.2.6
+          +--- org.wordpress-mobile.react-native-libraries.v2:react-native-clipboard:1.9.0
+          +--- org.wordpress-mobile.react-native-libraries.v2: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.6.0 (*)
+          |    |    +--- com.github.bumptech.glide:disklrucache:4.12.0
+          |    |    +--- com.github.bumptech.glide:annotations:4.12.0
+          |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.5.7 (*)
+          |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.0.0 -> 1.1.0 (*)
+          |    |    \--- androidx.exifinterface:exifinterface:1.2.0 -> 1.3.6 (*)
+          |    \--- 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.10.0 (*)
+          |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+          +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.97.1
+          |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+          |    +--- androidx.gridlayout:gridlayout:1.0.0
+          |    |    +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
+          |    |    \--- androidx.legacy:legacy-support-core-ui:1.0.0 (*)
+          |    +--- androidx.cardview:cardview:1.0.0 (*)
+          |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.6.1 (*)
+          |    +--- androidx.recyclerview:recyclerview:1.1.0 -> 1.3.0 (*)
+          |    +--- org.wordpress:aztec:v1.6.4 (*)
+          |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.6.4 (*)
+          |    +--- org.wordpress.aztec:wordpress-comments:v1.6.4 (*)
+          |    +--- org.wordpress.aztec:glide-loader:v1.6.4
+          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+          |    |    +--- org.wordpress:aztec:v1.6.4 (*)
+          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.12.0 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)
+          \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.21 (*)

Please review and act accordingly

@wpmobilebot
Copy link
Contributor

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr18673-7402eb4
Commit7402eb4
Direct Downloadwordpress-prototype-build-pr18673-7402eb4.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr18673-7402eb4
Commit7402eb4
Direct Downloadjetpack-prototype-build-pr18673-7402eb4.apk
Note: Google Login is not supported on these builds.

@oguzkocer oguzkocer merged commit 1131a7d into trunk Jun 19, 2023
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.

4 participants