[Draft][EMT-2431] - Google Play Billing Library Modularization #1323

bboothe-branch · 2025-09-25T13:57:00Z

Reference

EMT 2431 -- Google Play Billing Library Modularization.

Description

Added in the main structure of the potential update for Android Billing Library using Reflection

Testing Instructions

Download and run test app.
Test in-app purchase

Risk Assessment [`HIGH` || `MEDIUM` || `LOW`]

High Risk as this may break android billing entirely if not done correctly.

I, the PR creator, have tested — integration, unit, or otherwise — this code.

Reviewer Checklist (To be checked off by the reviewer only)

JIRA Ticket is referenced in PR title.
Correctness & Style
- Conforms to AOSP Style Guides
- Mission critical pieces are documented in code and out of code as needed.
Unit Tests reviewed and test issue sufficiently.
Functionality was reviewed in QA independently by another engineer on the team.

cc @BranchMetrics/saas-sdk-devs for visibility.

matter-code-review · 2025-09-25T13:57:50Z

Reference

SDK-2431 -- Emt 2431 - Draft PR.

Description

Summary By MatterAI

🔄 What Changed

This pull request executes the complete removal of the legacy BranchGooglePlayBillingV6 module. This includes the deletion of all source code, build configurations (build.gradle.kts), ProGuard rules, and Android instrumentation tests. This change follows the previous integration of the Google Play Billing V8 implementation, effectively purging the deprecated V6 logic from the codebase.

🔍 Impact of the Change

By removing the legacy V6 module, the project's technical debt is significantly reduced, and the build graph is simplified. This ensures that the SDK exclusively uses the newer Billing V8/V7 paths, preventing accidental usage of deprecated APIs. Note: The previously identified issues in the V8 implementation (empty listeners and instance creation bugs) still require attention as they are not addressed by this cleanup PR.

📁 Total Files Changed

Click to Expand

File	ChangeLog
Module Config `BranchGooglePlayBillingV6/build.gradle.kts`	Removed module-level build configuration and dependencies.
Legacy Logic `BranchGooglePlayBillingV6/src/main/java/.../BillingV6Implementation.kt`	Deleted the legacy Billing V6 implementation class.
Manifest Removal `BranchGooglePlayBillingV6/src/main/AndroidManifest.xml`	Removed the Android manifest for the V6 library module.
Test Cleanup `BranchGooglePlayBillingV6/src/androidTest/.../ExampleInstrumentedTest.kt`	Deleted instrumentation tests for the V6 module.
Unit Tests `BranchGooglePlayBillingV6/src/test/.../ExampleUnitTest.kt`	Removed local unit tests for the V6 module.
ProGuard Rules `BranchGooglePlayBillingV6/proguard-rules.pro`	Deleted module-specific obfuscation rules.

🧪 Test Added/Recommended

Added

N/A (This PR focuses on code removal).

🔒Security Vulnerabilities

N/A

Testing Instructions

Perform a clean build of the project and verify that no references to the BranchGooglePlayBillingV6 module remain in the final artifacts.

Risk Assessment [`LOW`]

This is a structural cleanup. The risk is low as long as the module is no longer referenced by other project components.

I, the PR creator, have tested — integration, unit, or otherwise — this code.

Reviewer Checklist (To be checked off by the reviewer only)

JIRA Ticket is referenced in PR title.
Correctness & Style
- Conforms to AOSP Style Guides
- Mission critical pieces are documented in code and out of code as needed.
Unit Tests reviewed and test issue sufficiently.
Functionality was reviewed in QA independently by another engineer on the team.

cc @BranchMetrics/saas-sdk-devs for visibility.

⏳ Estimated code review effort

LOW (~5 minutes)

Tip

Quality Recommendations

Ensure the module is removed from the root settings.gradle.kts file to avoid build sync errors.
Verify that no other internal modules have a 'project(:BranchGooglePlayBillingV6)' dependency in their build files.

♫ Tanka Poem

Old paths now erased, 🧪
Legacy code swept away, 🧹
Clean builds lie ahead,
V8 stands alone and strong,
Science claims this victory. 🧬

Sequence Diagram

sequenceDiagram
    participant Project as Android Project
    participant V6 as BranchGooglePlayBillingV6
    participant V8 as BranchGooglePlayBillingV8

    Note over V6: Module Deleted
    Project->>Project: Update settings.gradle.kts
    Project->>V8: Route all Billing requests
    Note right of V8: V8 handles logic
    Project-->>V6: [No longer exists]

matter-code-review · 2025-09-25T13:57:50Z

Important

PR Review Skipped

PR review skipped as per the configuration setting. Run a manually review by commenting /matter review

💡Tips to use MatterAI

Command List

/matter summary: Generate AI Summary for the PR
/matter review: Generate AI Reviews for the latest commit in the PR
/matter review-full: Generate AI Reviews for the complete PR
/matter release-notes: Generate AI release-notes for the PR
/matter : Chat with your PR with MatterAI Agent
/matter remember : Generate AI memories for the PR
/matter explain: Get an explanation of the PR
/matter help: Show the list of available commands and documentation
Need help? Join our Discord server: https://discord.gg/fJU5DvanU3

Branch-SDK/src/androidTest/AndroidManifest.xml

gdeluna-branch · 2025-09-26T07:13:19Z

Branch-SDK/src/BillingGooglePlayModules/BillingV6/build.gradle

@@ -0,0 +1,40 @@
+plugins {


Are these gradle files necessary to get the library version?

You should be able to do this with
String billingClientVersion = com.android.billingclient.BuildConfig.VERSION_NAME;
in Java (or Kotlin) instead

You mean having that line in the main gradle file instead? So I'll remove the product flavors.

Doe that replace this? :compileOnly("com.android.billingclient:billing:6.0.1")

gdeluna-branch · 2025-09-26T07:25:40Z

Branch-SDK/build.gradle.kts

        isRequired = isReleaseBuild()
    }
+
+    flavorDimensions.add("billing")


Let's keep things simple and just check the buildconfig version string and conditionally execute the right library implementation.

Got it. Removing flavor dimensions

gdeluna-branch · 2025-09-26T07:25:57Z

settings.gradle.kts

@@ -1,5 +1,7 @@
 include(":Branch-SDK")
 include(":Branch-SDK-TestBed")
+include (":BillingGooglePlayModules:BillingV6V7", ":BillingGooglePlayModules:BillingV8")


Same as above, revert this

Removed this as well

gdeluna-branch · 2025-09-26T07:27:31Z

Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayReflection.java

+public class BillingGooglePlayReflection {
+    public static BillingGooglePlayInterface getBillingLibraryVersion() {
+        try {
+            // Check for a class added in version 8.0 or higher


This can be hopefully be simplified with my suggestion. Just parse the major version

There isn't a specific method to grab the version so the checks look for what's available in the version that is being used.

Just realizing that was for the reflection section. Replacing it!

matter-code-review · 2025-09-27T01:12:21Z

Important

PR Review Skipped

PR review skipped as per the configuration setting. Run a manually review by commenting /matter review

💡Tips to use MatterAI

Command List

/matter summary: Generate AI Summary for the PR
/matter review: Generate AI Reviews for the latest commit in the PR
/matter review-full: Generate AI Reviews for the complete PR
/matter release-notes: Generate AI release-notes for the PR
/matter : Chat with your PR with MatterAI Agent
/matter remember : Generate AI memories for the PR
/matter explain: Get an explanation of the PR
/matter help: Show the list of available commands and documentation
Need help? Join our Discord server: https://discord.gg/fJU5DvanU3

gdeluna-branch · 2025-09-29T08:20:11Z

Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayReflection.java

+
+public class BillingGooglePlayReflection {
+    public static BillingGooglePlayInterface getBillingLibraryVersion() {
+        String billingClient = com.android.billingclient.BuildConfig.VERSION_NAME;


Make the variable name a bit more relevant like billingClientVersion

Renamed to billingClientVersionString

gdeluna-branch · 2025-09-29T08:21:24Z

Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayReflection.java

+
+        try {
+            int majorIndex = billingClient.indexOf(".");
+            String majorVersion = billingClient.substring(0, majorIndex);


Might be worth making this version extraction bit into a utility function since this could be used in other places as well.

Created function called dependencyMajorVersionFinder and added it to DependencyUtils.kt

Function takes in a string with the depenency name and pulls out the major version number.

Kept the Version Name extract itself in the BillingGooglePlayReflection class so that the function can take in any method of calling the version name depending on what the class offers.

gdeluna-branch · 2025-09-29T08:22:14Z

Branch-SDK/src/main/java/io/branch/referral/BillingGooglePlayReflection.java

+            }
+
+        } catch (Exception e) {
+            System.err.println("Error parsing billing client version: " + e.getMessage());


Use BranchLogger.e instead of System.err.println

Changed to BranchLogger.e

gdeluna-branch · 2025-09-29T08:22:28Z

Branch-SDK/build.gradle.kts

    toolVersion = "0.8.10"
 }

+//configurations.all {


Delete this

matter-code-review · 2025-09-29T17:31:28Z

Important

PR Review Skipped

PR review skipped as per the configuration setting. Run a manually review by commenting /matter review

💡Tips to use MatterAI

Command List

/matter summary: Generate AI Summary for the PR
/matter review: Generate AI Reviews for the latest commit in the PR
/matter review-full: Generate AI Reviews for the complete PR
/matter release-notes: Generate AI release-notes for the PR
/matter : Chat with your PR with MatterAI Agent
/matter remember : Generate AI memories for the PR
/matter explain: Get an explanation of the PR
/matter help: Show the list of available commands and documentation
Need help? Join our Discord server: https://discord.gg/fJU5DvanU3

matter-code-review · 2025-09-29T23:44:13Z

Important

PR Review Skipped

PR review skipped as per the configuration setting. Run a manually review by commenting /matter review

💡Tips to use MatterAI

Command List

/matter summary: Generate AI Summary for the PR
/matter review: Generate AI Reviews for the latest commit in the PR
/matter review-full: Generate AI Reviews for the complete PR
/matter release-notes: Generate AI release-notes for the PR
/matter : Chat with your PR with MatterAI Agent
/matter remember : Generate AI memories for the PR
/matter explain: Get an explanation of the PR
/matter help: Show the list of available commands and documentation
Need help? Join our Discord server: https://discord.gg/fJU5DvanU3

bboothe-branch · 2025-09-29T23:45:51Z

Hey @gdeluna-branch I updated all of your comments and also added the V8 logic. Is there a better way to reference them in the BillingGooglePlayReflection.java file? Also, I'm hesitant to delete the BillingGooglePlay.kt file until everything is done and working.

Also still need to build the gradle to reference each version properly.

matter-code-review · 2025-12-19T21:18:40Z

Important

PR Review Skipped

PR review skipped as per the configuration setting. Run a manually review by commenting /matter review

💡Tips to use MatterAI

Command List

/matter summary: Generate AI Summary for the PR
/matter review: Generate AI Reviews for the latest commit in the PR
/matter review-full: Generate AI Reviews for the complete PR
/matter release-notes: Generate AI release-notes for the PR
/matter : Chat with your PR with MatterAI Agent
/matter remember : Generate AI memories for the PR
/matter explain: Get an explanation of the PR
/matter help: Show the list of available commands and documentation
Need help? Join our Discord server: https://discord.gg/fJU5DvanU3

bboothe-branch requested a review from gdeluna-branch September 25, 2025 13:57

gdeluna-branch reviewed Sep 26, 2025

View reviewed changes

Branch-SDK/src/androidTest/AndroidManifest.xml Show resolved Hide resolved

gdeluna-branch reviewed Sep 26, 2025

View reviewed changes

gdeluna-branch reviewed Sep 29, 2025

View reviewed changes

bboothe-branch added 2 commits December 19, 2025 15:53

First Draft of updated modules and files.

121bd4e

removed v6 module

c4e85a7

bboothe-branch force-pushed the bboothe-branch/EMT-2431 branch from dfcdcf2 to c4e85a7 Compare December 19, 2025 21:18

bboothe-branch changed the title ~~Emt 2431 - Draft PR~~ [Draft][EMT-2431] - Google Play Billing Library Modularization Dec 19, 2025

[Draft][EMT-2431] - Google Play Billing Library Modularization #1323

Are you sure you want to change the base?

[Draft][EMT-2431] - Google Play Billing Library Modularization #1323

Conversation

bboothe-branch commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reference

Description

Testing Instructions

Risk Assessment [HIGH || MEDIUM || LOW]

Reviewer Checklist (To be checked off by the reviewer only)

Uh oh!

matter-code-review bot commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reference

Description

Summary By MatterAI

🔄 What Changed

🔍 Impact of the Change

📁 Total Files Changed

🧪 Test Added/Recommended

Added

Recommended

🔒Security Vulnerabilities

Testing Instructions

Risk Assessment [LOW]

Reviewer Checklist (To be checked off by the reviewer only)

⏳ Estimated code review effort

Quality Recommendations

♫ Tanka Poem

Sequence Diagram

Uh oh!

matter-code-review bot commented Sep 25, 2025

PR Review Skipped

Command List

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gdeluna-branch Sep 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matter-code-review bot commented Sep 27, 2025

PR Review Skipped

Command List

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matter-code-review bot commented Sep 29, 2025

bboothe-branch commented Sep 25, 2025 •

edited

Loading

Risk Assessment [`HIGH` || `MEDIUM` || `LOW`]

matter-code-review bot commented Sep 25, 2025 •

edited

Loading

Risk Assessment [`LOW`]

gdeluna-branch Sep 26, 2025 •

edited

Loading