@@ -75,7 +75,7 @@ lane :release do |options|
7575 File . write ( artifacts_path , JSON . dump ( artifacts ) )
7676
7777 # Set the framework version in SystemEnvironment+Version.swift
78- new_content = File . read ( swift_environment_path ) . gsub! ( previous_version_number , release_version )
78+ new_content = File . read ( swift_environment_path ) . gsub! ( previous_version_number , release_version ) . gsub! ( '-SNAPSHOT' , '' )
7979 File . open ( swift_environment_path , 'w' ) { |f | f . puts ( new_content ) }
8080
8181 # Update sdk sizes
@@ -101,11 +101,17 @@ end
101101
102102lane :merge_main do
103103 merge_main_to_develop
104+ current_version = get_sdk_version_from_environment
105+ add_snapshot_to_current_version ( file_path : swift_environment_path )
106+ ensure_git_branch ( branch : 'develop' )
107+ sh ( "git add #{ swift_environment_path } " )
108+ sh ( "git commit -m 'Add snapshot postfix to v#{ current_version } '" )
109+ sh ( 'git push' )
104110end
105111
106112desc "Publish a new release to GitHub and CocoaPods"
107113lane :publish_release do |options |
108- release_version = File . read ( swift_environment_path ) . match ( /String \s += \s +"([ \d .]+)"/ ) [ 1 ]
114+ release_version = get_sdk_version_from_environment
109115 UI . user_error! ( "Release #{ release_version } has already been published." ) if git_tag_exists ( tag : release_version , remote : true )
110116 UI . user_error! ( 'Release version cannot be empty' ) if release_version . to_s . empty?
111117 ensure_git_branch ( branch : 'main' )
@@ -128,6 +134,10 @@ lane :publish_release do |options|
128134 update_spm ( version : release_version )
129135end
130136
137+ lane :get_sdk_version_from_environment do
138+ File . read ( swift_environment_path ) . match ( /String\s +=\s +"([\d .]+).*"/ ) [ 1 ]
139+ end
140+
131141private_lane :appstore_api_key do
132142 @appstore_api_key ||= app_store_connect_api_key (
133143 key_id : 'MT3PRT8TB7' ,
0 commit comments