Migrate to Gradle version catalog #1059

vegaro · 2023-06-12T12:10:38Z

Merging #1033 into main

base-application.gradle

codecov · 2023-06-12T16:53:56Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.76%. Comparing base (7fc9cac) to head (2a27338).
Report is 647 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1059   +/-   ##
=======================================
  Coverage   85.76%   85.76%           
=======================================
  Files         176      176           
  Lines        6222     6222           
  Branches      853      853           
=======================================
  Hits         5336     5336           
  Misses        551      551           
  Partials      335      335

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

tonidero · 2023-06-12T19:50:19Z

build.gradle

+    alias libs.plugins.androidx.navigation.safeargs apply false
+    //    TODO: is this needed?
+    alias libs.plugins.kotlin.kapt apply false
+    //    TODO: is this needed?


Hmm are these TODO's meant to be removed?

Looks like we only use parcelization in the public and feature/amazon modules, so I believe it should only be needed in those...

tonidero

Looks good but we should decide what to do with those todos

tonidero · 2023-06-13T07:51:21Z

build.gradle

+    alias libs.plugins.androidx.navigation.safeargs apply false
+    //    TODO: is this needed?
+    alias libs.plugins.kotlin.kapt apply false
+    //    TODO: is this needed?


Looks like we only use parcelization in the public and feature/amazon modules, so I believe it should only be needed in those...

vegaro · 2023-06-14T18:18:57Z

@tonidero removed those todos. I couldn't figure out how to remove parcelize from the root build.gradle, though

I also added a test bundle and extracted more versions

tonidero

Left a few more comments but it looks good!

common/build.gradle

build.gradle

tonidero · 2023-06-15T07:22:25Z

build.gradle

-    id "com.savvasdalkitsis.module-dependency-graph" version "0.9"
+    alias libs.plugins.mavenPublish apply false
+    alias libs.plugins.android.application apply false
+    alias libs.plugins.android.library apply false


So now we are adding both the application and library plugins here and applying them on the respective modules each. Is it necessary to specify both here?

Yes. Think this is the equivalent of adding the AGP plugin. Removing either plugin gives the same error as removing the parcelize (The request for this plugin could not be satisfied because the plugin is already on the classpath with an unknown version, so compatibility cannot be checked.). Removing application gives the issue in the apps, I am getting it in api-tester, and removing the library one gives it in common.

I think these plugins need to be applied both in the base and in the module's build.gradle. I guess it makes sense for the android plugins, because at the end of the day the need to build an android project, and this is the build.gradle of the project, but I am still not sure about the parcelize one.

examples/MagicWeather/gradle/libs.versions.toml

### Description This PR moves the new jetpack compose sample app added in #1056 to use gradle catalogs as added in #1059.

@tonidero

**This is an automatic release.** ### Bugfixes * Default customer info schema version to latest known by SDK (#1080) via Toni Rico (@tonidero) * Handle other diagnostics-related exceptions (#1076) via Toni Rico (@tonidero) * Return error in queryPurchases if error connecting to billing client (#1072) via Toni Rico (@tonidero) ### Other Changes * Fix offline entitlements integration tests (#1085) via Toni Rico (@tonidero) * Add defaultsRelease variant tests run configuration (#1074) via Toni Rico (@tonidero) * Compose sample app: move to gradle catalog (#1081) via Toni Rico (@tonidero) * Compose sample app: automate builds (#1082) via Toni Rico (@tonidero) * Compose sample app (#1056) via Toni Rico (@tonidero) * Migrate to Gradle version catalog (#1059) via Cesar de la Vega (@vegaro) * Trusted entitlements: Add logs with verification mode (#1067) via Toni Rico (@tonidero) * Sync pending purchases before getting customer info (#1073) via Toni Rico (@tonidero) * Refactor syncing pending transactions logic out of `Purchases` (#1058) via Toni Rico (@tonidero) * Refactor CustomerInfo listener and cache logic into CustomerInfoUpdater (#1052) via Toni Rico (@tonidero) * Trusted entitlements: Add integration tests (#1071) via Toni Rico (@tonidero) * Trusted entitlements: Add internal mechanism to force signing errors for tests (#1070) via Toni Rico (@tonidero) Co-authored-by: revenuecat-ops <[email protected]>

mikescamell · 2023-06-26T18:42:59Z

Hey @vegaro did I get listed as a contributor to this? 🙏

vegaro · 2023-06-27T09:31:13Z

@mikescamell You actually didn't, but you should have, looks like a bug both in GitHub and in our changelog generation script.

It's weird because you appear in https://github.com/RevenueCat/purchases-android/graphs/contributors but when clicking in the 2 commits link, nothing shows up 🤔

Your name also appears in the commit in main so I am not sure why GitHub is not picking it up:

I also noticed you appear in the 6.5.0 release https://github.com/RevenueCat/purchases-android/releases/tag/6.5.0, so not sure why this change didn't pick up your name

I will fix the changelog so your name is part of it. I will also give it a thought to see how we can change the external contributions flow so this doesn't happen again

Sorry about that! And thanks again for your contribution and for bringing it up!

mikescamell · 2023-06-27T10:22:55Z

@mikescamell You actually didn't, but you should have, looks like a bug both in GitHub and in our changelog generation script.

It's weird because you appear in https://github.com/RevenueCat/purchases-android/graphs/contributors but when clicking in the 2 commits link, nothing shows up 🤔

Your name also appears in the commit in main so I am not sure why GitHub is not picking it up:

I also noticed you appear in the 6.5.0 release https://github.com/RevenueCat/purchases-android/releases/tag/6.5.0, so not sure why this change didn't pick up your name

I will fix the changelog so your name is part of it. I will also give it a thought to see how we can change the external contributions flow so this doesn't happen again

Sorry about that! And thanks again for your contribution and for bringing it up!

I kept expecting to get an email with a tag from one of the releases and that's when I noticed the merge commit didn't mention me and I wondered what happened, seeing as I had no issues from my previous contribution as you said. I felt a little weird asking to be honest 😅 Thanks for making the effort to add me in 🙌

Migrate to Gradle version catalog (#1033)

e26b5cd

vegaro force-pushed the cesar/sdk-3179-migrate-to-gradle-version-catalog branch from 1b6eb17 to e26b5cd Compare June 12, 2023 12:20

vegaro commented Jun 12, 2023

View reviewed changes

base-application.gradle Show resolved Hide resolved

some fixes

ab4567a

vegaro added the build label Jun 12, 2023

vegaro requested a review from a team June 12, 2023 16:54

tonidero reviewed Jun 12, 2023

View reviewed changes

tonidero reviewed Jun 13, 2023

View reviewed changes

vegaro added 6 commits June 14, 2023 18:24

remove kapt

5028432

remove parcelize from common and utils

1876ee1

back in the utils module

92dae08

can't remove parcelize, removed safeargs

7ea646f

extracts more versions

cdafeb0

adds test bundle

d5ca8fc

tonidero approved these changes Jun 15, 2023

View reviewed changes

update magicweather dependencies

2a27338

vegaro merged commit 9f617e1 into main Jun 22, 2023

vegaro deleted the cesar/sdk-3179-migrate-to-gradle-version-catalog branch June 22, 2023 09:41

tonidero mentioned this pull request Jun 22, 2023

Compose sample app: move to gradle catalog #1081

Merged

RCGitBot mentioned this pull request Jun 22, 2023

[AUTOMATIC] Release/6.5.1 #1084

Closed

tonidero added a commit that referenced this pull request Jun 22, 2023

Compose sample app: move to gradle catalog (#1081)

6a48e92

### Description This PR moves the new jetpack compose sample app added in #1056 to use gradle catalogs as added in #1059.

RCGitBot mentioned this pull request Jun 23, 2023

[AUTOMATIC] Release/6.5.1 #1087

Merged

vegaro mentioned this pull request Jun 27, 2023

Update CHANGELOG.md to include external contribution #1100

Merged

vegaro added the pr:other label Sep 17, 2024

vegaro removed the pr:build label Sep 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate to Gradle version catalog #1059

Migrate to Gradle version catalog #1059

vegaro commented Jun 12, 2023

codecov bot commented Jun 12, 2023 •

edited

Loading

tonidero Jun 12, 2023

tonidero Jun 13, 2023

tonidero left a comment

tonidero Jun 13, 2023

vegaro commented Jun 14, 2023

tonidero left a comment

tonidero Jun 15, 2023

vegaro Jun 15, 2023

mikescamell commented Jun 26, 2023

vegaro commented Jun 27, 2023 •

edited

Loading

mikescamell commented Jun 27, 2023

Migrate to Gradle version catalog #1059

Migrate to Gradle version catalog #1059

Conversation

vegaro commented Jun 12, 2023

codecov bot commented Jun 12, 2023 • edited Loading

Codecov Report

tonidero Jun 12, 2023

Choose a reason for hiding this comment

tonidero Jun 13, 2023

Choose a reason for hiding this comment

tonidero left a comment

Choose a reason for hiding this comment

tonidero Jun 13, 2023

Choose a reason for hiding this comment

vegaro commented Jun 14, 2023

tonidero left a comment

Choose a reason for hiding this comment

tonidero Jun 15, 2023

Choose a reason for hiding this comment

vegaro Jun 15, 2023

Choose a reason for hiding this comment

mikescamell commented Jun 26, 2023

vegaro commented Jun 27, 2023 • edited Loading

mikescamell commented Jun 27, 2023

codecov bot commented Jun 12, 2023 •

edited

Loading

vegaro commented Jun 27, 2023 •

edited

Loading