Merge 23.8-rc-2 to trunk by oguzkocer · Pull Request #19703 · wordpress-mobile/WordPress-Android

oguzkocer · 2023-11-30T18:49:07Z

Includes the hotfix changes from #19694 and release/23.8 changes from #19682 & #19691. Note that #19691 was not included in 23.8-rc-2.

The following FluxC conflict was resolved by first merging the FluxC changes to trunk in wordpress-mobile/WordPress-FluxC-Android#2917 and using the merge commit as the new dependency.

<<<<<<< HEAD
    wordPressFluxCVersion = '2.57.1'
=======
    wordPressFluxCVersion = 'trunk-074487ec04dd2d0aa1e4d03608768119d3262a47'
>>>>>>> origin/trunk

…opup-strings New strings for popup for clear translations

…migration-crash [Prompts/Crash] Fix crash on Prompts local table migration

…to-23.8

Merge 23.7.1 to release/23.8

Merge 23.8-rc-2 to release/23.8

…elease_1.109.1 Integrate gutenberg-mobile release v1.109.1

…runk

wpmobilebot · 2023-11-30T18:55:34Z

Found 1 violations:

The PR caused the following dependency changes:

 +--- project :libs:editor
-|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.109.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.11.0 (*)
-|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.11.0 (*)
-|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-get-random-values:1.4.0
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-safe-area-context:4.6.3
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.9.10 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-screens:3.22.0
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.9.10 (*)
-|         |    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
-|         |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
-|         |    +--- 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 (*)
-|         |    \--- androidx.core:core-ktx:1.5.0 -> 1.10.0 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-svg:13.9.0
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-webview:11.26.1
-|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
-|         |    \--- androidx.webkit:webkit:1.4.0 -> 1.7.0 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-masked-view:0.2.9
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-clipboard:1.11.2
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-fast-image:8.5.11
-|         |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1
-|         |    |    +--- com.github.bumptech.glide:gifdecoder:4.15.1
-|         |    |    |    \--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|         |    |    +--- com.github.bumptech.glide:disklrucache:4.15.1
-|         |    |    +--- com.github.bumptech.glide:annotations:4.15.1
-|         |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
-|         |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-|         |    |    +--- androidx.exifinterface:exifinterface:1.3.3 -> 1.3.6 (*)
-|         |    |    \--- androidx.tracing:tracing:1.0.0 -> 1.1.0 (*)
-|         |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
-|         |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1 (*)
-|         |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.11.0 (*)
-|         |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-reanimated:2.17.0
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-gesture-handler:2.10.2
-|         |    +--- org.wordpress-mobile.react-native-libraries.v3:react-native-reanimated:2.17.0
-|         |    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
-|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.9.10 (*)
-|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-linear-gradient:2.7.3
-|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.109.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.8.0 (*)
-|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.8.0 (*)
-|         |    +--- org.wordpress.aztec:wordpress-comments:v1.8.0 (*)
-|         |    +--- org.wordpress.aztec:glide-loader:v1.8.0
-|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
-|         |    |    +--- org.wordpress:aztec:v1.8.0 (*)
-|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
+|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.109.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.11.0 (*)
+|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.11.0 (*)
+|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-4
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-get-random-values:1.4.0
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-safe-area-context:4.6.3
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.9.10 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-screens:3.22.0
+|         |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.9.10 (*)
+|         |    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
+|         |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
+|         |    +--- 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 (*)
+|         |    \--- androidx.core:core-ktx:1.5.0 -> 1.10.0 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-svg:13.9.0
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-webview:11.26.1
+|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
+|         |    \--- androidx.webkit:webkit:1.4.0 -> 1.7.0 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-masked-view:0.2.9
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-clipboard:1.11.2
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-fast-image:8.5.11
+|         |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1
+|         |    |    +--- com.github.bumptech.glide:gifdecoder:4.15.1
+|         |    |    |    \--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|         |    |    +--- com.github.bumptech.glide:disklrucache:4.15.1
+|         |    |    +--- com.github.bumptech.glide:annotations:4.15.1
+|         |    |    +--- androidx.fragment:fragment:1.3.6 -> 1.6.2 (*)
+|         |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+|         |    |    +--- androidx.exifinterface:exifinterface:1.3.3 -> 1.3.6 (*)
+|         |    |    \--- androidx.tracing:tracing:1.0.0 -> 1.1.0 (*)
+|         |    \--- com.github.bumptech.glide:okhttp3-integration:4.12.0
+|         |         +--- com.github.bumptech.glide:glide:4.12.0 -> 4.15.1 (*)
+|         |         +--- com.squareup.okhttp3:okhttp:3.9.1 -> 4.11.0 (*)
+|         |         \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-reanimated:2.17.0
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-gesture-handler:2.10.2
+|         |    +--- org.wordpress-mobile.react-native-libraries.v3:react-native-reanimated:2.17.0
+|         |    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
+|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.10.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.9.10 (*)
+|         +--- org.wordpress-mobile.react-native-libraries.v3:react-native-linear-gradient:2.7.3
+|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.109.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.8.0 (*)
+|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.8.0 (*)
+|         |    +--- org.wordpress.aztec:wordpress-comments:v1.8.0 (*)
+|         |    +--- org.wordpress.aztec:glide-loader:v1.8.0
+|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
+|         |    |    +--- org.wordpress:aztec:v1.8.0 (*)
+|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.15.1 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.10 (*)
-+--- org.wordpress:fluxc:{strictly trunk-074487ec04dd2d0aa1e4d03608768119d3262a47} -> trunk-074487ec04dd2d0aa1e4d03608768119d3262a47
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-074487ec04dd2d0aa1e4d03608768119d3262a47
-|    +--- org.greenrobot:eventbus:3.3.1
-|    |    \--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.11.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.10 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-|    +--- androidx.security:security-crypto:1.0.0
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    \--- com.google.crypto.tink:tink-android:1.5.0
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0
-|    |    \--- org.apache.commons:commons-lang3:3.12.0
-|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
-|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
-|    |    +--- androidx.room:room-common:2.5.0
-|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
-|    |    +--- androidx.sqlite:sqlite:2.3.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
-|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
-|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
-|    +--- androidx.room:room-ktx:2.4.2
-|    |    +--- androidx.room:room-common:2.4.2 -> 2.5.0 (*)
-|    |    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.7.3 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.46.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
++--- org.wordpress:fluxc:{strictly trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28} -> trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28
+|    +--- org.greenrobot:eventbus:3.3.1
+|    |    \--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.11.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.10 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+|    +--- androidx.security:security-crypto:1.0.0
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    \--- com.google.crypto.tink:tink-android:1.5.0
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0
+|    |    \--- org.apache.commons:commons-lang3:3.12.0
+|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
+|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
+|    |    +--- androidx.room:room-common:2.5.0
+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
+|    |    +--- androidx.sqlite:sqlite:2.3.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
+|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+|    +--- androidx.room:room-ktx:2.4.2
+|    |    +--- androidx.room:room-common:2.4.2 -> 2.5.0 (*)
+|    |    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.7.3 (*)
+|    +--- com.google.dagger:dagger:2.42 -> 2.46.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
 \--- org.wordpress:login:1.10.0
-     \--- org.wordpress:fluxc:2.57.0 -> trunk-074487ec04dd2d0aa1e4d03608768119d3262a47 (*)
+     \--- org.wordpress:fluxc:2.57.0 -> trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28 (*)

Please review and act accordingly

wpmobilebot · 2023-11-30T19:08:10Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr19703-3803744
	Commit	`3803744`
	Direct Download	`jetpack-prototype-build-pr19703-3803744.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2023-11-30T19:09:00Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr19703-3803744
	Commit	`3803744`
	Direct Download	`wordpress-prototype-build-pr19703-3803744.apk`

Note: Google Login is not supported on these builds.

mokagio

versionName rc number and versionCode bumps in version.properties (1386 to 1388 because of 1387 being the hotfix build)
string.xml updates
Diffs from the PRs that made it into this beta

SiobhyB and others added 17 commits November 28, 2023 09:01

New strings for popup for clear translations

657c40b

Merge pull request #19682 from wordpress-mobile/update/optimisation-p…

75fb8ae

…opup-strings New strings for popup for clear translations

Update Gutenberg ref

eff4460

Bump version number

e30f17f

Point to FluxC fix PR for Prompts conflict crash

c46efbb

Point to latest FluxC fix PR commit

18fd45e

Point to FluxC release version with Prompts fix

1a056a2

Merge pull request #19694 from wordpress-mobile/hotfix/19693-prompts-…

abdc058

…migration-crash [Prompts/Crash] Fix crash on Prompts local table migration

Merge remote-tracking branch 'origin/release/23.8' into merge/23.7.1-…

f13406a

…to-23.8

Merge pull request #19698 from wordpress-mobile/merge/23.7.1-to-23.8

c8cc330

Merge 23.7.1 to release/23.8

Freeze strings for translation

266947b

Update translations

d86958f

Bump version number

95ea116

Merge pull request #19699 from wordpress-mobile/new_beta/23.8-rc-2

d363d88

Merge 23.8-rc-2 to release/23.8

Release script: Update build.gradle gutenbergMobileVersion to ref

ec2905e

Merge pull request #19691 from wordpress-mobile/gutenberg/integrate_r…

c2913b6

…elease_1.109.1 Integrate gutenberg-mobile release v1.109.1

Merge remote-tracking branch 'origin/trunk' into merge/23.8-rc-2-to-t…

3803744

…runk

oguzkocer added the Releases label Nov 30, 2023

oguzkocer added this to the 23.9 milestone Nov 30, 2023

oguzkocer requested a review from a team November 30, 2023 18:49

oguzkocer enabled auto-merge November 30, 2023 18:49

mokagio approved these changes Nov 30, 2023

View reviewed changes

oguzkocer merged commit c625802 into trunk Nov 30, 2023

oguzkocer deleted the merge/23.8-rc-2-to-trunk branch November 30, 2023 20:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge 23.8-rc-2 to trunk - #19703

Merge 23.8-rc-2 to trunk#19703
oguzkocer merged 17 commits into
trunkfrom
merge/23.8-rc-2-to-trunk

oguzkocer commented Nov 30, 2023

Uh oh!

wpmobilebot commented Nov 30, 2023

Uh oh!

wpmobilebot commented Nov 30, 2023

Uh oh!

wpmobilebot commented Nov 30, 2023

Uh oh!

mokagio left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

oguzkocer commented Nov 30, 2023

Uh oh!

wpmobilebot commented Nov 30, 2023

The PR caused the following dependency changes:

Uh oh!

wpmobilebot commented Nov 30, 2023

Uh oh!

wpmobilebot commented Nov 30, 2023

Uh oh!

mokagio left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants