diff --git a/.gitignore b/.gitignore index 9b02e94..4b1f7ac 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ iOS/fastlane/screenshots ios/Runner/GoogleService-Info.plist android/app/google-services.json ios/Flutter/Secret.xcconfig +android/fastlane/metadata diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 25be2c8..0ea5d99 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -32,13 +32,14 @@ platform :android do desc "Deploy a new version to the Google Play" lane :deploy do - increment_version_code_time() + new_version_code = increment_version_code_time() gradle( task: "assemble", build_type: "Release" ) upload_to_play_store( track: 'production', + version_code: new_version_code, release_status: 'draft' ) end @@ -75,11 +76,10 @@ platform :android do # Update the version code in pubspec.yaml new_pubspec_content = pubspec_content.gsub(/version:\s(\d+\.\d+\.\d+)\+\d+/, "version: #{version_name}+#{new_version_code}") - # Write the updated pubspec.yaml content File.open(pubspec_path, "w") { |file| file.puts new_pubspec_content } - # puts "Updated version code in build.gradle to #{new_version_code}" + version_code end end diff --git a/android/version.properties b/android/version.properties index f69757a..1eba413 100644 --- a/android/version.properties +++ b/android/version.properties @@ -1,2 +1,2 @@ -versionName=6.2.0 -versionCode=2024091514 +versionName=6.2.1 +versionCode=2024091518 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index acb6697..bafdf81 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -386,7 +386,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2411171930; + CURRENT_PROJECT_VERSION = 2411201103; DEVELOPMENT_TEAM = F694X76A5X; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -522,7 +522,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2411171930; + CURRENT_PROJECT_VERSION = 2411201103; DEVELOPMENT_TEAM = F694X76A5X; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -550,7 +550,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2411171930; + CURRENT_PROJECT_VERSION = 2411201103; DEVELOPMENT_TEAM = F694X76A5X; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index a08016e..81236e6 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -34,7 +34,7 @@ CFBundleSignature ???? CFBundleVersion - 2411171930 + 2411201103 LSApplicationQueriesSchemes https diff --git a/pubspec.yaml b/pubspec.yaml index b36d7c8..bb99f20 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: swiftcomp description: A cross-platform composite calculator developed with Flutter, based on SwiftComp, designed for engineers and researchers. Available on iOS, Android, and Web. publish_to: none -version: 6.2.1+2024091514 +version: 6.2.1+2024091518 environment: sdk: ">=2.15.0 <3.0.0" @@ -40,7 +40,7 @@ dependencies: shared_preferences: ^2.2.3 intl: ^0.18.1 auto_size_text: ^3.0.0 - fluttertoast: ^8.0.8 + fluttertoast: ^8.2.8 provider: ^6.0.2 flutter_progress_hud: ^2.0.2 file: ^6.1.4