More project structure cleanup #4131

aboedo · 2024-07-29T14:26:49Z

More project structure cleanup:

Removes redundant workspace and project files for PurchaseTester
Cleans up bad references
Cleans up certificates
Re-does the process to deploy PurchaseTester, since it was designed to run from the xcworkspace, which doesn't work anymore.
adds a dry-run option to deploying PurchaseTester and adds a job for it in the all-tests workflow. It tries building it and archiving but doesn't actually publish to TestFlight. We didn't really have a test for this, so it's another thing that could have broken in production.

aboedo · 2024-07-29T14:27:07Z

@RCGitBot please test

aboedo · 2024-07-30T16:37:49Z

@RCGitBot please test

…ing, move PurchaseTester scheme to top level

…rchaseTester to use the RevenueCat workspace

…s for testing

aboedo · 2024-07-30T19:20:26Z

@RCGitBot please test

aboedo · 2024-07-30T19:21:05Z

.circleci/config.yml

@@ -1231,9 +1231,20 @@ jobs:
      - update-spm-installation-commit
      - run:
          name: Submit Purchase Tester
-          working_directory: "Tests/TestingApps/PurchaseTesterSwiftUI"


no longer needed or desired, we want the jobs to run from the root since that's where the framework is generated

aboedo · 2024-07-30T19:21:19Z

.circleci/config.yml

-      # temporarily disabled since this won't work when building directly from its workspace.
-      # there's another PR to re-enable it
-      # - deploy-purchase-tester:
-      #     requires:
-      #       - make-release
-      #     <<: *release-tags
+      - deploy-purchase-tester:
+          requires:
+            - make-release
+          <<: *release-tags


we can re-enable this now

aboedo · 2024-07-30T19:21:51Z

.circleci/config.yml

@@ -1421,3 +1430,4 @@ workflows:
      - installation-tests-carthage
      - installation-tests-xcode-direct-integration
      - installation-tests-receipt-parser
+      - deploy-purchase-tester-dry-run


dry run job in all-tests so that we know if we're breaking purchase tester (I didn't realize that I had broken it until Toni mentioned it in a PR comment)

aboedo · 2024-07-30T19:22:04Z

RevenueCat.xcodeproj/project.pbxproj

@@ -1200,14 +1200,12 @@
 		2DD500E22C519EB4009C19B7 /* PurchaseTesterApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseTesterApp.swift; sourceTree = "<group>"; };
 		2DD500E32C519EB4009C19B7 /* ReceiptInspector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptInspector.swift; sourceTree = "<group>"; };
 		2DD500E42C519EB4009C19B7 /* ReceiptVerifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptVerifier.swift; sourceTree = "<group>"; };
-		2DD500E52C519EB4009C19B7 /* RevenueCat_SwiftUIConfiguration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = RevenueCat_SwiftUIConfiguration.storekit; sourceTree = "<group>"; };


cleanup, this no longer exists

aboedo · 2024-07-30T19:22:13Z

RevenueCat.xcodeproj/project.pbxproj

 		2DD500E62C519EB4009C19B7 /* Windows.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Windows.swift; sourceTree = "<group>"; };
 		2DD500E82C519EB4009C19B7 /* AppIcon.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AppIcon.xcassets; sourceTree = "<group>"; };
 		2DD500E92C519EB4009C19B7 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		2DD500EA2C519EB4009C19B7 /* PurchaseTester-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PurchaseTester-Info.plist"; sourceTree = "<group>"; };
 		2DD500EB2C519EB4009C19B7 /* PurchaseTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PurchaseTester.entitlements; sourceTree = "<group>"; };
 		2DD500EC2C519EB4009C19B7 /* PurchaseTester.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = PurchaseTester.xcodeproj; sourceTree = "<group>"; };
-		2DD500ED2C519EB4009C19B7 /* PurchaseTester.xcworkspace */ = {isa = PBXFileReference; lastKnownFileType = wrapper.workspace; path = PurchaseTester.xcworkspace; sourceTree = "<group>"; };


removed the workspace since it doesn't add any more value

aboedo · 2024-07-30T19:24:57Z

fastlane/Fastfile

@@ -701,7 +701,6 @@ platform :ios do
      './Tests/InstallationTests/ReceiptParserInstallation/ReceiptParserInstallation.xcodeproj/project.pbxproj',
      './Tests/APITesters/CustomEntitlementComputationSwiftAPITester/CustomEntitlementComputationSwiftAPITester.xcodeproj/project.pbxproj',
      './Tests/APITesters/RevenueCatUIAPITester/RevenueCatUISwiftAPITester.xcodeproj/project.pbxproj',
-      './Tests/TestingApps/PurchaseTesterSwiftUI/PurchaseTester.xcodeproj/project.pbxproj',


I had missed this but we no longer have a hardcoded commit in that file since we're now using a local dependency instead, so this is unnecessary

aboedo · 2024-07-30T19:26:07Z

fastlane/Fastfile

-  lane :deploy_purchase_tester do
-    latest_changelog = File.read("#{File.dirname(__FILE__)}/../#{changelog_latest_path}")


quite a few changes here, but they ultimately boil down to updating things so that we're running the lane from the repo root rather than PurchaseTester root.
This is because we do need to get the RevenueCat SDK that's generated at the top level. It wasn't needed before since we were using an SPM dependency on a hardcoded commit instead, but the local dependency is much easier to work with on a daily basis.

aboedo · 2024-07-30T19:26:56Z

fastlane/Fastfile

-    ios_build(changelog)
-    macos_build(changelog)


I also removed the local functions because I wanted to reuse a couple of the parameters without having to pass them in over and over. I can re-add them, but I don't usually find local functions to be easier to read. Thoughts?

I'm ok with that. I think it only could make some sense in some situations where the code needs to be executed multiple times, so I agree with the change 👍

aboedo · 2024-07-30T19:28:02Z

fastlane/Fastfile

+        provisioningProfiles: {
+          "com.revenuecat.sampleapp" => "match AppStore com.revenuecat.sampleapp",
+          "com.revenuecat.sampleapp.watchkitapp" => "match AppStore com.revenuecat.sampleapp.watchkitapp"
+        }


I ended up passing the profiles explicitly here. I'm not entirely sure what I'm missing, but it seems like fastlane was reading the values from the Matchfile previously. I don't think there's a way for fastlane to read the Matchfile from a different directory.

Maybe @joshdholtz knows? Maybe I could just import it?

aboedo · 2024-07-30T19:28:35Z

scripts/pre-commit.sh

@@ -38,7 +38,6 @@ verify_no_included_apikeys() {
    "${SCRIPT_DIR}/../Examples/MagicWeather/MagicWeather/Constants.swift"
    "${SCRIPT_DIR}/../Examples/MagicWeatherSwiftUI/Shared/Constants.swift"
    "${SCRIPT_DIR}/../Tests/TestingApps/PurchaseTesterSwiftUI/Core/Constants.swift"
-    "${SCRIPT_DIR}/../Tests/TestingApps/PurchaseTester/PurchaseTester/Constants.swift"


This was for the old purchaseTester UIKit, no longer exists so no longer needed

tonidero

I tested it out for a bit and looks good to me!

tonidero · 2024-07-31T07:28:12Z

.circleci/config.yml

+      - update-spm-installation-commit
+      - run:
+          name: Submit Purchase Tester
+          command: bundle exec fastlane deploy_purchase_tester dry_run:true


Hmm I guess the dry_run could be a parameter of the job... But maybe this is better so it's more delimited, I'm ok keeping it as is.

I think it should be a parameter, main reason is that if we update the deploy-purchase-tester job, we will probably forget about updating this other job. Having a single job with a parameter will make sure we only have to update one thing

That's a great point. It's slightly tricky because of how we re-use jobs, but it's still very easy. I'll open up a separate PR for it since this one is approved and so that we can have a specific conversation about it

tonidero · 2024-07-31T07:35:19Z

fastlane/Fastfile

-    ios_build(changelog)
-    macos_build(changelog)


I'm ok with that. I think it only could make some sense in some situations where the code needs to be executed multiple times, so I agree with the change 👍

@tonidero

Cleans up the deploy purchase tester job's treatment of `dry-run`: it's now a parameter of the job instead of a separate job entirely. This is based off of @tonidero and @vegaro's feedback in #4131

## More project structure cleanup: - Removes redundant workspace and project files for PurchaseTester - Cleans up bad references - Cleans up certificates - Re-does the process to deploy PurchaseTester, since it was designed to run from the xcworkspace, which doesn't work anymore. - adds a `dry-run` option to deploying PurchaseTester and adds a job for it in the all-tests workflow. It tries building it and archiving but doesn't actually publish to TestFlight. We didn't really have a test for this, so it's another thing that could have broken in production.

@tonidero

Cleans up the deploy purchase tester job's treatment of `dry-run`: it's now a parameter of the job instead of a separate job entirely. This is based off of @tonidero and @vegaro's feedback in #4131

@aboedo

**This is an automatic release.** ### Bugfixes * Fix Paywalls crash on iOS 18 beta (#4154) via Andy Boedo (@aboedo) ### Dependency Updates * Bump danger from 9.4.3 to 9.5.0 (#4143) via dependabot[bot] (@dependabot[bot]) * Bump nokogiri from 1.16.6 to 1.16.7 (#4129) via dependabot[bot] (@dependabot[bot]) * Bump fastlane from 2.221.1 to 2.222.0 (#4130) via dependabot[bot] (@dependabot[bot]) ### Other Changes * Update deployment targets for tests (#4145) via Andy Boedo (@aboedo) * Deploy purchaserTester: clean up dry-run parameter (#4140) via Andy Boedo (@aboedo) * Clean up API Testers (#4141) via Andy Boedo (@aboedo) * More project structure cleanup (#4131) via Andy Boedo (@aboedo) * temporarily disables purchasetester deploy (#4133) via Andy Boedo (@aboedo) * Fix trigger all tests branch (#4135) via Andy Boedo (@aboedo) * Clean up XCWorkspace and testing apps (#4111) via Andy Boedo (@aboedo) * tests trigger: add target-branch parameter to trigger from the right branch (#4121) via Andy Boedo (@aboedo) * Re-added the RevenueCatUI tests job on every commit (#4113) via Andy Boedo (@aboedo)

## More project structure cleanup: - Removes redundant workspace and project files for PurchaseTester - Cleans up bad references - Cleans up certificates - Re-does the process to deploy PurchaseTester, since it was designed to run from the xcworkspace, which doesn't work anymore. - adds a `dry-run` option to deploying PurchaseTester and adds a job for it in the all-tests workflow. It tries building it and archiving but doesn't actually publish to TestFlight. We didn't really have a test for this, so it's another thing that could have broken in production.

@tonidero

Cleans up the deploy purchase tester job's treatment of `dry-run`: it's now a parameter of the job instead of a separate job entirely. This is based off of @tonidero and @vegaro's feedback in #4131

@aboedo

**This is an automatic release.** ### Bugfixes * Fix Paywalls crash on iOS 18 beta (#4154) via Andy Boedo (@aboedo) ### Dependency Updates * Bump danger from 9.4.3 to 9.5.0 (#4143) via dependabot[bot] (@dependabot[bot]) * Bump nokogiri from 1.16.6 to 1.16.7 (#4129) via dependabot[bot] (@dependabot[bot]) * Bump fastlane from 2.221.1 to 2.222.0 (#4130) via dependabot[bot] (@dependabot[bot]) ### Other Changes * Update deployment targets for tests (#4145) via Andy Boedo (@aboedo) * Deploy purchaserTester: clean up dry-run parameter (#4140) via Andy Boedo (@aboedo) * Clean up API Testers (#4141) via Andy Boedo (@aboedo) * More project structure cleanup (#4131) via Andy Boedo (@aboedo) * temporarily disables purchasetester deploy (#4133) via Andy Boedo (@aboedo) * Fix trigger all tests branch (#4135) via Andy Boedo (@aboedo) * Clean up XCWorkspace and testing apps (#4111) via Andy Boedo (@aboedo) * tests trigger: add target-branch parameter to trigger from the right branch (#4121) via Andy Boedo (@aboedo) * Re-added the RevenueCatUI tests job on every commit (#4113) via Andy Boedo (@aboedo)

aboedo added the ci label Jul 29, 2024

aboedo self-assigned this Jul 29, 2024

aboedo mentioned this pull request Jul 30, 2024

temporarily disables purchasetester deploy #4133

Merged

aboedo added 10 commits July 30, 2024 15:35

removed PurchaseTesterSwiftUI's redundant xcproject and workspace

a638135

more cleanup, removed unused badly-referenced file

976dffc

removed redundant storekit config

71663c6

re-add PurchaseTester scheme

996bb31

updated local signing for purchase tester to use automatic xcode sign…

5d4c8ee

…ing, move PurchaseTester scheme to top level

intermediate commit, updated the fastlane lane to build and upload pu…

dced8e7

…rchaseTester to use the RevenueCat workspace

clean up the code

5fde01d

add deploy purchase tester dry run step to all tests

7412bfb

re-enable deploy purchase tester job on release

9767720

temporarily deploy purchase tester with dry run enabled on all commit…

4cedaa6

…s for testing

aboedo force-pushed the andy/more_structure_cleanup branch from bb60bf8 to 4cedaa6 Compare July 30, 2024 18:46

aboedo added 3 commits July 30, 2024 15:50

updated so that match runs for iOS and macOS in separate stages

3ccad83

updated signing for the Core framework in PurchaseTester

0d82b52

remove temporary job

7975485

aboedo marked this pull request as ready for review July 30, 2024 19:20

aboedo commented Jul 30, 2024

View reviewed changes

aboedo requested a review from a team July 30, 2024 19:28

tonidero approved these changes Jul 31, 2024

View reviewed changes

vegaro approved these changes Jul 31, 2024

View reviewed changes

aboedo merged commit 28b5f2d into main Jul 31, 2024
33 checks passed

aboedo deleted the andy/more_structure_cleanup branch July 31, 2024 19:43

aboedo mentioned this pull request Jul 31, 2024

Deploy purchaserTester: clean up dry-run parameter #4140

Merged

RCGitBot mentioned this pull request Aug 7, 2024

[AUTOMATIC] Release/5.2.3 #4153

Closed

RCGitBot mentioned this pull request Aug 7, 2024

[AUTOMATIC] Release/5.2.3 #4155

Merged

vegaro added the pr:other label Sep 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More project structure cleanup #4131

More project structure cleanup #4131

aboedo commented Jul 29, 2024 •

edited

Loading

aboedo commented Jul 29, 2024

aboedo commented Jul 30, 2024

aboedo commented Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

tonidero Jul 31, 2024

aboedo Jul 30, 2024

aboedo Jul 30, 2024

tonidero left a comment

tonidero Jul 31, 2024

vegaro Jul 31, 2024

aboedo Jul 31, 2024

tonidero Jul 31, 2024

		lane :deploy_purchase_tester do
		latest_changelog = File.read("#{File.dirname(__FILE__)}/../#{changelog_latest_path}")

More project structure cleanup #4131

More project structure cleanup #4131

Conversation

aboedo commented Jul 29, 2024 • edited Loading