[WIP] Use vendored `fluxc` and `login` #13304

wzieba · 2025-01-14T13:23:27Z

Description

This PR introduces necessary changes to make the assembleWasabiDebug pass when using vendored fluxc and login modules.

Among others, this PR:

replaces coordinates of fluxc and login to point to local modules
updates dependencies and adds missing ones for vendored modules
unifies JVM version
adds necessary dependencies
fixes minor code issues, forced by Kotlin update on vendored codebase

The current state of PR is based on code from following commits

FluxC: 657a72d968f89dc2edd6a6e6e57f579643d1e213
Login: 706a58b33ff8f1a2858ae64e51204426ec12fe7b

Extraction from FluxC and Login

To perform extractions/filtering, I've used the following script.

Caution

DO NOT RUN the script, it's only for preview and understanding what actions has been performed via git filter-repo

script

#!/bin/bash

# Prepare FluxC

cd ~

rm -rf WordPress-FluxC-Android

git clone [email protected]:wordpress-mobile/WordPress-FluxC-Android.git

cd WordPress-FluxC-Android

git checkout 657a72d968f89dc2edd6a6e6e57f579643d1e213

git filter-repo \
--path-rename example/build.gradle:fluxc-tests/build.gradle \
--path-rename example/src/test:fluxc-tests/src/test \
--force

git filter-repo \
--path fluxc-annotations \
--path fluxc-processor \
--path fluxc \
--path plugins/woocommerce \
--path fluxc-tests \
--force

git filter-repo \
--path-rename fluxc-annotations:libs/fluxc-annotations \
--path-rename fluxc-processor:libs/fluxc-processor \
--path-rename plugins/woocommerce:libs/fluxc-plugin \
--path-rename fluxc:libs/fluxc \
--path-rename fluxc-tests:libs/fluxc-tests

git checkout -b filtered

cd ~/woocommerce-android

git checkout trunk

git pull

git branch -D fluxc_with_history

git checkout -b fluxc_with_history

git pull fluxcfiltered filtered --allow-unrelated-histories --no-rebase

git push --set-upstream origin fluxc_with_history -f

## Prepare Login

cd ~

rm -rf WordPress-Login-Flow-Android

git clone [email protected]:wordpress-mobile/WordPress-Login-Flow-Android.git

cd WordPress-Login-Flow-Android

git checkout 706a58b33ff8f1a2858ae64e51204426ec12fe7b

git filter-repo --path WordPressLoginFlow --force

git filter-repo --path-rename WordPressLoginFlow:libs/login --force

git checkout -b filtered

cd ~/woocommerce-android

git checkout fluxc_with_history

git branch -D login_with_history

git checkout -b login_with_history

git pull loginflowfilter filtered --allow-unrelated-histories --no-rebase

git push --set-upstream origin login_with_history -f

## Update adjustment branch

git checkout login_with_history

git branch -D adjust_fluxc_login_vendor

git checkout -b adjust_fluxc_login_vendor

# Now cherry pick adjustments commits manually

Testing information

The whole app needs to be tested: nothing in particular.

The tests that have been performed

Images/gif

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

dangermattic · 2025-01-14T13:24:35Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2025-01-14T13:27:55Z

Project dependencies changes

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

list

Removed Dependencies
org.wordpress.fluxc.plugins:woocommerce:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
org.wordpress.fluxc:fluxc-annotations:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
org.wordpress:fluxc:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
org.wordpress:login:trunk-706a58b33ff8f1a2858ae64e51204426ec12fe7b

tree

-+--- org.wordpress:fluxc:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 -> 2.0.21
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*)
-|    |    +--- 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 -> 2.0.21 (*)
-|    |    +--- 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.1 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
-|    +--- 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.1 (*)
-|    |    |    \--- 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.8.7 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.8.7 (*)
-|    |    \--- 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 -> 2.0.21 (*)
-+--- org.wordpress.fluxc.plugins:woocommerce:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213
-|    +--- org.wordpress:fluxc:trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213 (*)
-|    +--- 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-657a72d968f89dc2edd6a6e6e57f579643d1e213
-|    +--- androidx.room:room-ktx:2.6.1 (*)
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
-\--- org.wordpress:login:trunk-706a58b33ff8f1a2858ae64e51204426ec12fe7b
-     +--- com.gravatar:gravatar:0.2.0
-     |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
-     |    +--- com.squareup.retrofit2:retrofit:2.9.0
-     |    |    \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*)
-     |    +--- com.squareup.retrofit2:converter-gson:2.9.0
-     |    |    +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
-     |    |    \--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*)
-     |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
-     +--- androidx.appcompat:appcompat:1.6.1 (*)
-     +--- androidx.constraintlayout:constraintlayout:2.0.4 -> 2.1.4 (*)
-     +--- com.google.android.material:material:1.2.1 -> 1.12.0 (*)
-     +--- androidx.core:core:1.12.0 -> 1.13.1 (*)
-     +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0
-     |    +--- com.github.bumptech.glide:gifdecoder:4.16.0
-     |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
-     |    +--- com.github.bumptech.glide:disklrucache:4.16.0
-     |    +--- com.github.bumptech.glide:annotations:4.16.0
-     |    +--- androidx.fragment:fragment:1.3.6 -> 1.8.5 (*)
-     |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
-     |    +--- androidx.exifinterface:exifinterface:1.3.6 (*)
-     |    \--- androidx.tracing:tracing:1.0.0 (*)
-     +--- androidx.credentials:credentials:1.2.0
-     |    +--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
-     |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
-     |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
-     |    \--- androidx.credentials:credentials-play-services-auth:1.2.0 (c)
-     +--- androidx.credentials:credentials-play-services-auth:1.2.0
-     |    +--- androidx.credentials:credentials:1.2.0 (*)
-     |    +--- com.google.android.gms:play-services-auth:20.7.0 (*)
-     |    +--- com.google.android.gms:play-services-fido:20.1.0 (*)
-     |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0
-     |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.0.21 (*)
-     |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)
-     |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
-     |    \--- androidx.credentials:credentials:1.2.0 (c)
-     +--- com.google.dagger:dagger:2.47 -> 2.51.1 (*)
-     +--- com.google.dagger:dagger-android-support:2.47 -> 2.50
-     |    +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
-     |    +--- com.google.dagger:dagger-android:2.50
-     |    |    +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
-     |    |    +--- com.google.dagger:dagger-lint-aar:2.50
-     |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-     |    |    \--- javax.inject:javax.inject:1
-     |    +--- com.google.dagger:dagger-lint-aar:2.50
-     |    +--- androidx.activity:activity:1.5.1 -> 1.8.1 (*)
-     |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-     |    +--- androidx.appcompat:appcompat:1.3.1 -> 1.6.1 (*)
-     |    +--- androidx.fragment:fragment:1.5.1 -> 1.8.5 (*)
-     |    +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.8.7 (*)
-     |    +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.8.7 (*)
-     |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 -> 2.8.7 (*)
-     |    \--- javax.inject:javax.inject:1
-     +--- com.google.android.gms:play-services-auth:18.1.0 -> 20.7.0 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
++--- project :libs:fluxc
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- project :libs:fluxc-annotations
+|    +--- 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.1 (*)
+|    |    |    \--- 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.8.7 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.8.7 (*)
+|    |    \--- 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:2.0.21 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- org.wordpress:utils:3.15.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.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 -> 2.0.21 (*)
+|    |    +--- 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.50 -> 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.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
+|         +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+|         \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
+|              \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
++--- project :libs:fluxc-plugin
+|    +--- org.wordpress:wellsql:2.0.0 (*)
+|    +--- project :libs:fluxc-annotations
+|    +--- androidx.room:room-ktx:2.6.1 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+|    +--- project :libs:fluxc (*)
+|    +--- org.wordpress:utils:3.15.0 (*)
+|    +--- com.google.code.gson:gson:2.10.1
+|    +--- com.google.dagger:dagger:2.50 -> 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 (*)
+\--- project :libs:login
+     +--- com.google.android.gms:play-services-auth:20.2.0 -> 20.7.0 (*)
+     +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+     +--- org.wordpress:utils:3.15.0 (*)
+     +--- com.gravatar:gravatar:0.2.0
+     |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
+     |    +--- com.squareup.retrofit2:retrofit:2.9.0
+     |    |    \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*)
+     |    +--- com.squareup.retrofit2:converter-gson:2.9.0
+     |    |    +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
+     |    |    \--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*)
+     |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
+     +--- androidx.appcompat:appcompat:1.4.2 -> 1.6.1 (*)
+     +--- androidx.constraintlayout:constraintlayout:2.1.4 (*)
+     +--- com.google.android.material:material:1.12.0 (*)
+     +--- androidx.core:core-ktx:1.13.1 (*)
+     +--- project :libs:fluxc (*)
+     +--- com.github.bumptech.glide:glide:4.16.0
+     |    +--- com.github.bumptech.glide:gifdecoder:4.16.0
+     |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
+     |    +--- com.github.bumptech.glide:disklrucache:4.16.0
+     |    +--- com.github.bumptech.glide:annotations:4.16.0
+     |    +--- androidx.fragment:fragment:1.3.6 -> 1.8.5 (*)
+     |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+     |    +--- androidx.exifinterface:exifinterface:1.3.6 (*)
+     |    \--- androidx.tracing:tracing:1.0.0 (*)
+     +--- androidx.credentials:credentials:1.2.0
+     |    +--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*)
+     |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
+     |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*)
+     |    \--- androidx.credentials:credentials-play-services-auth:1.2.0 (c)
+     +--- androidx.credentials:credentials-play-services-auth:1.2.0
+     |    +--- androidx.credentials:credentials:1.2.0 (*)
+     |    +--- com.google.android.gms:play-services-auth:20.7.0 (*)
+     |    +--- com.google.android.gms:play-services-fido:20.1.0 (*)
+     |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0
+     |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.0.21 (*)
+     |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*)
+     |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
+     |    \--- androidx.credentials:credentials:1.2.0 (c)
+     +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
+     \--- com.google.dagger:dagger-android-support:2.50
+          +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
+          +--- com.google.dagger:dagger-android:2.50
+          |    +--- com.google.dagger:dagger:2.50 -> 2.51.1 (*)
+          |    +--- com.google.dagger:dagger-lint-aar:2.50
+          |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+          |    \--- javax.inject:javax.inject:1
+          +--- com.google.dagger:dagger-lint-aar:2.50
+          +--- androidx.activity:activity:1.5.1 -> 1.8.1 (*)
+          +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+          +--- androidx.appcompat:appcompat:1.3.1 -> 1.6.1 (*)
+          +--- androidx.fragment:fragment:1.5.1 -> 1.8.5 (*)
+          +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.8.7 (*)
+          +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.8.7 (*)
+          +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 -> 2.8.7 (*)
+          \--- javax.inject:javax.inject:1

Build environment changes

The following changes in the build classpath were detected:

list

New Dependencies
org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.0.21

tree

+\--- org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:2.0.21
+     \--- org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21 (*)

wpmobilebot · 2025-01-14T13:34:52Z

📲 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	`ffd798b`
	Direct Download	`woocommerce-wear-prototype-build-pr13304-ffd798b.apk`

wpmobilebot · 2025-01-14T13:45:19Z

📲 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	`ffd798b`
	Direct Download	`woocommerce-prototype-build-pr13304-ffd798b.apk`

github-advanced-security

Android Lint found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

This PR introduces necessary changes to make the `assembleWasabiDebug` pass when using vendored `fluxc` and `login` modules. Among others, this PR: - replaces coordinates of `fluxc` and `login` to point to local modules - updates dependencies and adds missing ones for vendored modules - unifies JVM version - adds necessary dependencies - fixes minor code issues, forced by Kotlin update on vendored codebase

Which contains all unit tests from original `example` module. Also, this commit adds a number of changes to make unit tests run. `ArrayUtilsTest` is removed as `ArrayUtils` was an example-app only class.

- `mockito` upgrade is necessary to make the build work with newer JDKs ``` Java 21 (65) is not supported by the current version of Byte Buddy which officially supports Java 20 (64) - update Byte Buddy or set net.bytebuddy.experimental as a VM property ``` - since 5.0, `mockito-core` includes the `mockito-inline` module

To address `NoWhenBranchMatchedException`: these failing tests were crashing because `response` in `ProductRestClient#fetchProducts` was checked in `when` branch, while the value was null (not mocked). This change was requested by Kotlin update.

Citing the documentation: ``` The List type in Java is mapped to the MutableList type in Kotlin. Because the List.removeFirst() and List.removeLast() APIs have been introduced in Android 15 (API level 35), the Kotlin compiler resolves function calls, for example list.removeFirst(), statically to the new List APIs instead of to the extension functions in kotlin-stdlib. If an app is re-compiled with compileSdk set to 35 and minSdk set to 34 or lower, and then the app is run on Android 14 and lower, a runtime error is thrown: ``` https://developer.android.com/about/versions/15/behavior-changes-15

They were not enabled/configured back in FluxC, so enabling them here causes hundreds of violations. Adjust `MagicNumber` rule to also fit newly added codebase

gradle/libs.versions.toml

…-tests` and `login` modules This option was not enabled originally.

wzieba · 2025-01-22T17:07:55Z

@ParaskP7 this PR is ready for the first round of reviews. The chain of branches is following:

trunk -> fluxc_with_history -> login_with_history -> adjust_fluxc_login_vendor

*_history branches are result of git filter-repo - I'll prepare PRs for them later, but they don't have to be really reviewed as it was with WPAndroid.

I'm working right now on running benchmarks to make sure that we don't experience any performance regression with incremental builds. After this, and syncing with Woo Android team, this work will be ready to be merged.

ParaskP7

👋 @wzieba !

I have reviewed and (quickly) tested this PR as per the instructions, everything works as expected, another amazing job well done, kudos! 🌟 x 🌟 ^ 🌟

PS: Thanks for adding the script you run for the extractions/filtering of fluxc and login.

I have left a question (❓), a few suggestions (💡) and some minor (🔍) comments for you to consider. I am going to approve this PR anyway, since none is blocking. I am NOT going to merge this PR yet to give you some time to apply any of my suggestions. However, feel free to ignore them and merge the PR yourself.

EXTRAS

About all the comments I added in my review, 18 in total, I know, but all I did is to gather the TODOs for you. I am sure that you already planned for most of those changes, but I didn't want to risk missing some of those, losing par with JP/WPAndroid.
I didn't do a thorough smoke test of the project, just a quick one. I am hoping that, after you apply any of the comment included in this review, someone from the WCAndroid team will jump on it with a thorough smoke test and give us a final 🟢 light for the merge.

config/detekt/detekt.yml

ParaskP7 · 2025-01-23T11:47:23Z

gradle/libs.versions.toml

Minor (🔍): Some things I noticed during review, some related, some unrelated to the actual changes in this PR:

Related: The androidx-appcompat version is pointing to 1.4.2 but the login library was pointing to 1.6.1, we could consider updating it to point to a latest version instead of an older one. PS: I am sure that transitive updates already pointing to a much newer version, but... 🤷

Unrelated: The androidx-activity version is unused, we could consider removing it.

Unrelated: The android-billingclient-ktx and bumptech-glide-ksp libraries are unused, we could consider removing them.

ParaskP7 · 2025-01-23T11:49:35Z

gradle/libs.versions.toml

 wordpress-libaddressinput = '0.0.2'
+wordpress-lint = "2.0.0"


Minor (🔍): The wordpress-lint version is pointing to 2.0.0 but the login library was pointing to 2.1.0, we could consider updating it to point to a latest version instead of an older one.

gradle/libs.versions.toml

ParaskP7 · 2025-01-23T12:18:57Z

libs/fluxc-annotations/build.gradle

-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility libs.versions.java.get()
+    targetCompatibility libs.versions.java.get()

    withSourcesJar()
    withJavadocJar()


Minor (🔍): Consider removing this configuration above.

PS: Same applies for the fluxc-processor module.

ParaskP7 · 2025-01-23T12:23:33Z

libs/fluxc-plugin/build.gradle

Question (❓): I want to question this testInstrumentationRunner here and this one MigrationTests related test.

I am not sure it is being kept up-to-date, see the latest test being the testMigration36to37 with WC_DATABASE_VERSION pointing to 38 already. 🤔

Maybe we should remove this UI/connected test and any androidTest configuration. And if not, maybe we should make this test part of the CI pipeline? 🤔

ParaskP7 · 2025-01-23T12:28:21Z

libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt

-        remoteComments.removeFirst()
+        remoteComments.removeAt(0)
+        remoteComments.removeAt(0)
+        remoteComments.removeAt(0)


Praise (❤️): Nicely done!

FYI: I've searched through the codebase and I found this last reference of RollingLogEntries.add(...) -> removeFirst(). Maybe something to look into? 🤔

ParaskP7 · 2025-01-23T12:29:31Z

libs/login/build.gradle

@@ -1,123 +1,90 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {


Suggestion (💡): How about converting this to alias to keep the consistency between modules:

alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.kapt)

ParaskP7 · 2025-01-23T12:31:01Z

libs/login/build.gradle

@@ -1,123 +1,90 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
    id "com.android.library"
    id "org.jetbrains.kotlin.android"
    id "org.jetbrains.kotlin.kapt"


Suggestion (💡): Replacing kapt with ksp for this module is quite simple, maybe we should consider it.

PS: Then, we could also remove the allWarningsAsErrors = false related configuration from this module.

ParaskP7 · 2025-01-23T14:34:56Z

Minor (🔍): Btw @wzieba I forgot to mention in my review above that we would also want to also remove the local-builds.gradle configuration for both the localFluxCPath and localLoginFlowPath.

ParaskP7 · 2025-01-23T14:44:04Z

The current state of PR is based on code from following commits

FluxC: 657a72d968f89dc2edd6a6e6e57f579643d1e213

Login: 706a58b33ff8f1a2858ae64e51204426ec12fe7b

Another thing I forgot to mention @wzieba is that FluxC's trunk is already 3 commits ahead:

PS: Login's trunk is still on par.

github-advanced-security bot found potential problems Jan 14, 2025

View reviewed changes

wzieba mentioned this pull request Jan 14, 2025

Unify Gradle repositories #13307

Merged

4 tasks

wzieba force-pushed the login_with_history branch from df275bc to a17b932 Compare January 14, 2025 17:15

wzieba force-pushed the adjust_fluxc_login_vendor branch from 54707c5 to 11253d1 Compare January 14, 2025 17:15

wzieba force-pushed the login_with_history branch 9 times, most recently from bd9aece to bb71676 Compare January 15, 2025 15:59

wzieba force-pushed the adjust_fluxc_login_vendor branch from 11253d1 to 0cb655c Compare January 15, 2025 16:34

wzieba force-pushed the login_with_history branch from bb71676 to 565d952 Compare January 17, 2025 10:49

wzieba force-pushed the adjust_fluxc_login_vendor branch from 0cb655c to 2f75caf Compare January 17, 2025 11:10

wzieba force-pushed the login_with_history branch from 565d952 to 4048993 Compare January 22, 2025 12:24

wzieba force-pushed the adjust_fluxc_login_vendor branch from 7b5ebd2 to 5d08958 Compare January 22, 2025 12:32

wzieba force-pushed the login_with_history branch from 4048993 to db27b1d Compare January 22, 2025 12:36

wzieba added 6 commits January 22, 2025 13:38

Introduce fluxc-tests module

494ae4c

Which contains all unit tests from original `example` module. Also, this commit adds a number of changes to make unit tests run. `ArrayUtilsTest` is removed as `ArrayUtils` was an example-app only class.

Mock a response from wooNetwork

80f1107

To address `NoWhenBranchMatchedException`: these failing tests were crashing because `response` in `ProductRestClient#fetchProducts` was checked in `when` branch, while the value was null (not mocked). This change was requested by Kotlin update.

Disable formatting rules from fluxc and login modules

eaeaacf

They were not enabled/configured back in FluxC, so enabling them here causes hundreds of violations. Adjust `MagicNumber` rule to also fit newly added codebase

wzieba force-pushed the adjust_fluxc_login_vendor branch from 5d08958 to eaeaacf Compare January 22, 2025 12:39

Remove unused commented code from fluxc-tests

f7a890d

github-advanced-security bot found potential problems Jan 22, 2025

View reviewed changes

Disable allWarningsAsErrors only in fluxc, fluxc-plugin, `fluxc…

ffd798b

…-tests` and `login` modules This option was not enabled originally.

wzieba force-pushed the adjust_fluxc_login_vendor branch from cc2d648 to ffd798b Compare January 22, 2025 15:17

wzieba requested a review from ParaskP7 January 22, 2025 17:08

wzieba added type: enhancement A request for an enhancement. category: architecture Related to architecture such as the database, FluxC, Networking, Core Data, etc. labels Jan 22, 2025

wzieba added this to the 21.6 milestone Jan 22, 2025

wzieba marked this pull request as ready for review January 22, 2025 17:20

ParaskP7 approved these changes Jan 23, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Use vendored `fluxc` and `login` #13304

[WIP] Use vendored `fluxc` and `login` #13304

wzieba commented Jan 14, 2025 •

edited

Loading

dangermattic commented Jan 14, 2025 •

edited

Loading

wpmobilebot commented Jan 14, 2025 •

edited

Loading

wpmobilebot commented Jan 14, 2025 •

edited

Loading

wpmobilebot commented Jan 14, 2025 •

edited

Loading

github-advanced-security bot left a comment

wzieba commented Jan 22, 2025

ParaskP7 left a comment

ParaskP7 Jan 23, 2025

ParaskP7 Jan 23, 2025

ParaskP7 Jan 23, 2025

ParaskP7 Jan 23, 2025

ParaskP7 Jan 23, 2025

ParaskP7 Jan 23, 2025

ParaskP7 Jan 23, 2025

ParaskP7 commented Jan 23, 2025

ParaskP7 commented Jan 23, 2025

		@@ -1,123 +1,90 @@
		import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

		plugins {

[WIP] Use vendored fluxc and login #13304

Are you sure you want to change the base?

[WIP] Use vendored fluxc and login #13304

Conversation

wzieba commented Jan 14, 2025 • edited Loading

Description

Extraction from FluxC and Login

Testing information

The tests that have been performed

Images/gif

Reviewer (or Author, in the case of optional code reviews):

dangermattic commented Jan 14, 2025 • edited Loading

wpmobilebot commented Jan 14, 2025 • edited Loading

Project dependencies changes

Build environment changes

wpmobilebot commented Jan 14, 2025 • edited Loading

wpmobilebot commented Jan 14, 2025 • edited Loading

github-advanced-security bot left a comment

Choose a reason for hiding this comment

wzieba commented Jan 22, 2025

ParaskP7 left a comment

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 Jan 23, 2025

Choose a reason for hiding this comment

ParaskP7 commented Jan 23, 2025

ParaskP7 commented Jan 23, 2025

[WIP] Use vendored `fluxc` and `login` #13304

[WIP] Use vendored `fluxc` and `login` #13304

wzieba commented Jan 14, 2025 •

edited

Loading

dangermattic commented Jan 14, 2025 •

edited

Loading

wpmobilebot commented Jan 14, 2025 •

edited

Loading

wpmobilebot commented Jan 14, 2025 •

edited

Loading

wpmobilebot commented Jan 14, 2025 •

edited

Loading