Merge branch 'release/3.2.0' into wppinar/refresh-profile-on-upload

Author: pinarol

.buildkite/pipeline.yml

@@ -48,6 +48,15 @@ steps:
             permit_on_passed: true
         agents:
           queue: linter
+      
+      - label: ":swift: Package.resolved"
+        plugins: [$CI_TOOLKIT]
+        notify:
+          - github_commit_status:
+              context: "Package.resolved"
+        command: |
+          install_gems
+          bundle exec make validate-package-resolved
 
   #################
   # Build and Test

Makefile

@@ -59,6 +59,9 @@ ifndef BUILD_NUMBER
 	override BUILD_NUMBER = 0
 endif
 
+validate-package-resolved: bundle-install
+	@bundle exec fastlane validate_package_resolved scheme:$(SCHEME_DEMO)
+
 bundle-install:
 	bundle install
 

fastlane/Fastfile

@@ -80,6 +80,18 @@ platform :ios do
     )
   end
 
+  desc 'Checks whether all Package.resolved files are current'
+  lane :validate_package_resolved do |scheme:|
+    resolve_package_dependencies_for_project(project: XCODEPROJ_PATH, scheme: scheme)
+    resolve_package_dependencies_for_spm
+
+    if uncommitted_changes.empty?
+      UI.success('No uncommitted changes found.')
+    else
+      UI.user_error!("Uncommitted changes detected: \n #{uncommitted_changes}")
+    end
+  end
+
   desc 'Builds the demo app from the given scheme for distribution'
   lane :build_demo_for_distribution do |scheme:, build_number:|
     UI.user_error! 'Please pass a build number by calling the lane with build_number:VALUE' if build_number.nil? || build_number.empty?
@@ -219,3 +231,21 @@ def read_from_xcconfig!(key:, xcconfig:)
 
   configs[key]
 end
+
+def resolve_package_dependencies_for_project(project:, scheme:)
+  xcodebuild(
+    project: project,
+    scheme: scheme,
+    configuration: 'Debug',
+    clean: true,
+    xcargs: '-resolvePackageDependencies -skipPackageUpdates'
+  )
+end
+
+def resolve_package_dependencies_for_spm
+  spm(command: 'resolve')
+end
+
+def uncommitted_changes
+  sh('git status --porcelain').strip
+end