diff --git a/Gemfile.lock b/Gemfile.lock index b7ddd73a0e..5c1ee20b6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM json (>= 1.5.1) atomos (0.1.3) aws-eventstream (1.1.0) - aws-partitions (1.359.0) + aws-partitions (1.362.0) aws-sdk-core (3.105.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -23,7 +23,7 @@ GEM aws-sdk-kms (1.37.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.79.0) + aws-sdk-s3 (1.79.1) aws-sdk-core (~> 3, >= 3.104.3) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -89,7 +89,7 @@ GEM faraday_middleware (1.0.0) faraday (~> 1.0) fastimage (2.2.0) - fastlane (2.156.1) + fastlane (2.157.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) aws-sdk-s3 (~> 1.0) @@ -144,7 +144,7 @@ GEM google-cloud-env (1.3.3) faraday (>= 0.17.3, < 2.0) google-cloud-errors (1.0.1) - google-cloud-storage (1.27.0) + google-cloud-storage (1.28.0) addressable (~> 2.5) digest-crc (~> 0.4) google-api-client (~> 0.33) diff --git a/bin/release_version.sh b/bin/release_version.sh index 0ad1e1d199..d09b8b86f5 100755 --- a/bin/release_version.sh +++ b/bin/release_version.sh @@ -45,7 +45,8 @@ pod trunk push Purchases.podspec echo "Preparing Carthage release" echo "building..." -carthage build --archive +carthage build --no-skip-current +carthage archive Purchases echo "creating uploads folder if needed" mkdir $CARTHAGE_UPLOADS_PATH diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3d7fe00db4..658479a6f4 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -55,8 +55,6 @@ platform :ios do fail "please add a CHANGELOG.latest.md file before calling this lane" end - xcframeworks_zip_path = export_xcframeworks(output_directory: "builds/xcframeworks") - set_github_release( repository_name: "revenuecat/purchases-ios", api_token: ENV["GITHUB_TOKEN"], @@ -64,7 +62,7 @@ platform :ios do tag_name: "#{release_version}", description: changelog, commitish: "master", - upload_assets: ["CarthageUploads/Purchases.framework.zip", xcframeworks_zip_path], + upload_assets: ["CarthageUploads/Purchases.framework.zip"], is_draft: false ) end @@ -83,35 +81,6 @@ platform :ios do Spaceship::Tunes::SandboxTester.create!(email: email, password: password) end - desc "Export XCFrameworks" - lane :export_xcframeworks do |options| - output_directory = options[:output_directory] - fail ArgumentError, "missing output directory" unless output_directory - - platforms = [ - 'iOS', - 'macOS', - 'tvOS', - 'watchOS' - ] - create_xcframework( - destinations: platforms, - scheme: 'PurchasesCoreSwift', - xcframework_output_directory: output_directory - ) - - create_xcframework( - destinations: platforms, - scheme: 'Purchases', - xcframework_output_directory: output_directory - ) - - xcframeworks_zip_path = output_directory + ".zip" - zip(path: output_directory, - output_path: xcframeworks_zip_path) - return xcframeworks_zip_path - end - end def increment_build_number(previous_version_number, new_version_number, file_path)