From 831aa9116d114f65968e900ce541243a1bcc22cd Mon Sep 17 00:00:00 2001
From: JayShortway <29483617+JayShortway@users.noreply.github.com>
Date: Tue, 24 Mar 2026 19:05:10 +0100
Subject: [PATCH] Fixes release automations

---
 .circleci/config.yml |  36 +----------
 fastlane/Fastfile    | 150 ++++++++++++++++---------------------------
 2 files changed, 59 insertions(+), 127 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 613d5259d..889165908 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,14 +114,8 @@ commands:
 parameters:
   action:
     type: enum
-    enum: [ build, upgrade-hybrid-common, bump ]
+    enum: [ build, bump ]
     default: build
-  automatic:
-    type: boolean
-    default: false
-  version:
-    type: string
-    default: ''
 
 executors:
   android202409:
@@ -144,24 +138,6 @@ executors:
       HOMEBREW_NO_AUTO_UPDATE: 1
 
 jobs:
-  update-purchases-hybrid-common-version:
-    description: "Opens a PR updating the purchases-hybrid-common dependency to the latest version."
-    executor: xcode16
-    steps:
-      - checkout
-      - pin-ruby-version
-      - revenuecat/install-gem-mac-dependencies:
-          cache-version: v1
-      - revenuecat/trust-github-key
-      - revenuecat/setup-git-credentials
-      - run:
-          name: Update purchases-hybrid-common to << pipeline.parameters.version >>
-          command: |
-            bundle exec fastlane update_hybrid_common \
-            version:<< pipeline.parameters.version >> \
-            open_pr:true \
-            automatic_release:<< pipeline.parameters.automatic >>
-
   prepare-next-snapshot-version:
     description: "Opens a PR updating the SDK version to the next minor, appending -SNAPSHOT."
     executor: ruby3
@@ -402,6 +378,7 @@ jobs:
         type: boolean
     steps:
       - checkout
+      - checkout-submodule
       - install-android-sdk-on-macos
       - pin-ruby-version
       - revenuecat/install-gem-mac-dependencies:
@@ -436,15 +413,6 @@ jobs:
           command: bundle exec fastlane github_release_current_version
 
 workflows:
-  on-action-upgrade-hybrid-common:
-    when:
-      equal: [ upgrade-hybrid-common, << pipeline.parameters.action >> ]
-    jobs:
-      - update-purchases-hybrid-common-version:
-          context:
-            - git-user-ops
-            - github-bot-public
-
   # This workflow runs for any commit to main, as well as for any other
   # branch with an open PR, except for release branches. This is controlled 
   # by the "Only build pull requests" setting on CircleCI. 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 097b8685b..959200857 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -24,7 +24,6 @@ FILES_WITH_SDK_VERSION = {
 
 desc "Bumps version, edits changelog, and creates pull request"
 lane :bump do |options|
-  phc_version = get_phc_version
   bump_version_update_changelog_create_pr(
     current_version: current_version_number,
     changelog_latest_path: PATH_CHANGELOG_LATEST,
@@ -36,16 +35,10 @@ lane :bump do |options|
     editor: options[:editor],
     next_version: options[:next_version],
     automatic_release: options[:automatic_release],
-    hybrid_common_version: phc_version,
     versions_file_path: PATH_VERSIONS,
-    is_prerelease: options[:is_prerelease],
-    append_phc_version_if_next_version_is_not_prerelease: true
-  )
-  update_hybrids_versions_file(
-    versions_file_path: PATH_VERSIONS,
-    new_sdk_version: current_version_number,
-    hybrid_common_version: phc_version
+    is_prerelease: options[:is_prerelease]
   )
+  update_versions_file(current_version_number)
   commit_current_changes(commit_message: 'Updates VERSIONS.md')
   push_to_git_remote(set_upstream: true)
 end
@@ -68,62 +61,6 @@ lane :automatic_bump do |options|
   bump(options)
 end
 
-desc "Update purchases-hybrid-common dependency"
-lane :update_hybrid_common do |options|
-  if options[:dry_run]
-    dry_run = true
-  end
-  if options[:version]
-    new_phc_version = options[:version]
-  else
-    UI.user_error!("Missing `version` argument")
-  end
-
-  current_phc_version = get_phc_version
-
-  UI.message("ℹ️  Current Purchases Hybrid Common version: #{current_phc_version}")
-  UI.message("ℹ️  Setting Purchases Hybrid Common version: #{new_phc_version}")
-  files_to_update = {
-    "gradle/libs.versions.toml" => ["revenuecat-common = \"{x}\""],
-    "core/core.podspec" => ["spec.dependency 'PurchasesHybridCommon', '{x}'"],
-    "mappings/mappings.podspec" => ["spec.dependency 'PurchasesHybridCommon', '{x}'"],
-    "models/models.podspec" => ["spec.dependency 'PurchasesHybridCommon', '{x}'"],
-    "revenuecatui/revenuecatui.podspec" => ["spec.dependency 'PurchasesHybridCommonUI', '{x}'"],
-    "iosApp/Podfile" => ["  pod 'PurchasesHybridCommon', '{x}'", "  pod 'PurchasesHybridCommonUI', '{x}'"],
-  }
-
-  if dry_run
-    UI.message("ℹ️  Nothing more to do, dry_run: true")
-    next
-  end
-
-  bump_phc_version(
-    repo_name: REPO_NAME,
-    files_to_update: files_to_update,
-    current_version: current_phc_version,
-    next_version: new_phc_version,
-    open_pr: options[:open_pr] || false,
-    automatic_release: options[:automatic_release] || false
-  )
-  # Making sure Podfile.lock is updated.
-  podfile = "iosApp/Podfile"
-  cocoapods(
-    podfile: podfile,
-    repo_update: true
-  )
-  if options[:open_pr]
-    git_commit(
-      path: ["#{podfile}.lock"],
-      message: "Updates Podfile.lock",
-      skip_git_hooks: true
-    )
-    push_to_git_remote(
-      tags: false,
-      no_verify: true
-    )
-  end
-end
-
 desc "Opens a PR updating the SDK version to the next minor, appending -SNAPSHOT."
 lane :prepare_next_snapshot_version do |options|
   create_next_snapshot_version(
@@ -179,40 +116,67 @@ lane :github_release do |options|
   )
 end
 
-def get_phc_version
-  android_phc_version = File.read("../gradle/libs.versions.toml")
-    .match("revenuecat-common = \"(.*)\"")
-    .captures[0]
-  UI.user_error!("Android PHC version not found.") if android_phc_version.nil?
-  
-  ios_phc_version = File.read("../core/core.podspec")
-    .match("spec.dependency 'PurchasesHybridCommon', '(.*)'")
+def current_version_number
+  File.read("../gradle/libs.versions.toml")
+    .match('revenuecat-kmp = "(.*)"')
     .captures[0]
-  UI.user_error!("iOS PHC version not found.") if ios_phc_version.nil?
+end
 
-  ios_phc_ui_version = File.read("../revenuecatui/revenuecatui.podspec")
-    .match("spec.dependency 'PurchasesHybridCommonUI', '(.*)'")
+def get_android_version
+  version = File.read("../gradle/libs.versions.toml")
+    .match('revenuecat-android = "(.*)"')
     .captures[0]
-  UI.user_error!("iOS PHC UI version not found.") if ios_phc_ui_version.nil?
-  
-  versions_mismatch_error = "Found multiple PHC (UI) versions. Please make sure to use only 1."
-  versions_match = android_phc_version == ios_phc_version && ios_phc_version == ios_phc_ui_version
-  UI.user_error!(versions_mismatch_error) unless versions_match
-  
-  android_phc_version
-  end
+  UI.user_error!("Android version not found in libs.versions.toml") if version.nil?
+  version
+end
 
-  def current_version_number
-    File.read("../gradle/libs.versions.toml")
-      .match("revenuecat-kmp = \"(.*)\"")
-      .captures[0]
-  end
+def get_ios_version
+  version = File.read("../upstream/purchases-ios/.version").strip
+  UI.user_error!("iOS version not found in upstream/purchases-ios/.version") if version.nil? || version.empty?
+  version
+end
 
-  def check_no_git_tag_exists(version_number)
-    if git_tag_exists(tag: version_number, remote: true, remote_name: 'origin')
-      raise "git tag with version #{version_number} already exists!"
-    end
+def get_billing_client_version(android_version)
+  require 'base64'
+  response = github_api(
+    server_url: 'https://api.github.com',
+    api_token: ENV["GITHUB_TOKEN"],
+    http_method: 'GET',
+    path: "/repos/RevenueCat/purchases-android/contents/gradle/libs.versions.toml?ref=#{android_version}"
+  )
+  contents = Base64.decode64(response[:json]['content'])
+  matches = contents.match('bc8 = "(.*)"')
+  UI.user_error!("Could not find Play Billing Library version for purchases-android #{android_version}") unless matches
+  matches.captures[0]
+end
+
+def update_versions_file(sdk_version)
+  android_version = get_android_version
+  ios_version = get_ios_version
+  billing_version = get_billing_client_version(android_version)
+
+  UI.message("Android version: #{android_version}")
+  UI.message("iOS version: #{ios_version}")
+  UI.message("Play Billing Library version: #{billing_version}")
+
+  versions_path = File.join('..', PATH_VERSIONS)
+  lines = File.readlines(versions_path)
+  new_line = [
+    sdk_version,
+    "[#{ios_version}](https://github.com/RevenueCat/purchases-ios/releases/tag/#{ios_version})",
+    "[#{android_version}](https://github.com/RevenueCat/purchases-android/releases/tag/#{android_version})",
+    "N/A",
+    "[#{billing_version}](https://developer.android.com/google/play/billing/release-notes)"
+  ].join(' | ')
+  lines.insert(2, "| #{new_line} |\n")
+  File.write(versions_path, lines.join)
+end
+
+def check_no_git_tag_exists(version_number)
+  if git_tag_exists(tag: version_number, remote: true, remote_name: 'origin')
+    raise "git tag with version #{version_number} already exists!"
   end
+end
 
 # Publishes the SDK. If the current version is a SNAPSHOT version, it will be published
 # to Sonatype's snapshots repository, otherwise it will be published to Maven Central.