Merge release/20.8 into trunk #12800

wpmobilebot · 2024-10-18T15:49:15Z

Merging release/20.8 into trunk.

Via intermediate branch merge/release-20.8-into-trunk, to help fix conflicts if any:

                            release/20.8  ----o-- - - -
                                               \
           merge/release-20.8-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

Release/20.8 update changelog

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>

…-keys Release/20.8 update import keys

dangermattic · 2024-10-18T15:52:13Z

	1 Message
📖	This PR has the `Releases` label: some checks will be skipped.

Generated by 🚫 Danger

wpmobilebot · 2024-10-18T15:55:49Z

Project dependencies changes

The following changes in project dependencies were detected (configuration vanillaReleaseRuntimeClasspath):

list

Upgraded Dependencies
org.wordpress.fluxc.plugins:woocommerce:2.99.1, (changed from trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152)
org.wordpress.fluxc:fluxc-annotations:2.99.1, (changed from trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152)
org.wordpress:fluxc:2.99.1, (changed from trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152)
org.wordpress:login:1.19.0, (changed from trunk-cb4a9fe62e9371d14fff30a3abd7e91b5e8d1623)

tree

-+--- org.wordpress:fluxc:trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.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.7.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
++--- org.wordpress:fluxc:2.99.1
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:2.99.1
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.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.7.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-+--- org.wordpress.fluxc.plugins:woocommerce:trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152
-|    +--- org.wordpress:fluxc:trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- com.google.dagger:dagger:2.51.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0 (*)
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-5dfbbc993d2472f6aad2b9f357021506ecfe7152
-|    +--- androidx.room:room-ktx:2.6.1 (*)
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
++--- org.wordpress.fluxc.plugins:woocommerce:2.99.1
+|    +--- org.wordpress:fluxc:2.99.1 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- com.google.dagger:dagger:2.51.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0 (*)
+|    +--- org.wordpress.fluxc:fluxc-annotations:2.99.1
+|    +--- androidx.room:room-ktx:2.6.1 (*)
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-\--- org.wordpress:login:trunk-cb4a9fe62e9371d14fff30a3abd7e91b5e8d1623
+\--- org.wordpress:login:1.19.0

wpmobilebot · 2024-10-18T15:56:06Z

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

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`c854589`
	Direct Download	`woocommerce-wear-prototype-build-pr12800-c854589.apk`

wpmobilebot · 2024-10-18T15:57:40Z

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

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`c854589`
	Direct Download	`woocommerce-prototype-build-pr12800-c854589.apk`

wpmobilebot and others added 14 commits October 18, 2024 07:06

Bump version number

122d5ea

Update draft release notes for 20.8.

f058008

Release Notes: add new section for next version (20.9)

9b39c40

Update fluxc and login library version to latest release

32450b0

Update changelog to a more readable version

bfecf4e

Merge pull request #12798 from woocommerce/release/20.8-update-changelog

85189cf

Release/20.8 update changelog

Update fastlane import-keys to match the new library catalog keys

64973bb

Update outdated comment

3f18d89

Update outdated path to the new version catalog file

a9fa514

Rename path constant

26c5c09

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>

Rename path constant

776124f

Merge pull request #12799 from woocommerce/release/20.8-update-import…

8ba4460

…-keys Release/20.8 update import keys

Update PlayStoreStrings.po for 20.8

2ba8fd3

Freeze strings for translation

c854589

wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Oct 18, 2024

wpmobilebot added this to the 20.9 milestone Oct 18, 2024

JorgeMucientes self-assigned this Oct 18, 2024

JorgeMucientes self-requested a review October 18, 2024 16:25

JorgeMucientes approved these changes Oct 18, 2024

View reviewed changes

JorgeMucientes merged commit e1ef2aa into trunk Oct 18, 2024
19 of 20 checks passed

JorgeMucientes deleted the merge/release-20.8-into-trunk branch October 18, 2024 16:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release/20.8 into trunk #12800

Merge release/20.8 into trunk #12800

wpmobilebot commented Oct 18, 2024

dangermattic commented Oct 18, 2024

wpmobilebot commented Oct 18, 2024

wpmobilebot commented Oct 18, 2024

wpmobilebot commented Oct 18, 2024

Merge release/20.8 into trunk #12800

Merge release/20.8 into trunk #12800

Conversation

wpmobilebot commented Oct 18, 2024

dangermattic commented Oct 18, 2024

wpmobilebot commented Oct 18, 2024

Project dependencies changes

wpmobilebot commented Oct 18, 2024

wpmobilebot commented Oct 18, 2024