Skip to content

Commit 3de60b7

Browse files
authored
[auto] update overlays
1 parent fb5a4d0 commit 3de60b7

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ firebase-debug.log
4545
/flutter/fastlane/Preview.html
4646
# "scan" action temporary files.
4747
/flutter/fastlane/test_output
48+
# fastlane updates the README templates way too often, resulting in CI failures.
49+
/**/fastlane/README.md
4850

4951
# File created by "flutter generate".
5052
/flutter/.packages.generated

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dart.flutterSdkPath": "flutter/.flutter"
3+
}

fastlane/Fastfile

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,11 @@ lane :update do
1818
update_analysis_options
1919
Dir.chdir('..') do
2020
Dir.chdir('flutter') do
21-
# This will automatically upgrade flutter, if necessary. It won't run
22-
# "flutter update-packages", but we don't need it.
23-
flutter_root = flutter_bootstrap(flutter_channel: 'stable')
24-
25-
# Copy over .gitignore from official templates.
26-
FileUtils.cp(
27-
File.join(
28-
flutter_root,
29-
'packages/flutter_tools/templates/app/.gitignore.tmpl',
30-
),
31-
'.gitignore',
32-
)
33-
3421
Dir.chdir('fastlane') do
22+
# This will automatically upgrade flutter, if necessary. It won't run
23+
# "flutter update-packages", but we don't need it.
24+
flutter_bootstrap(flutter_channel: 'stable')
25+
3526
# Upgrade current application packages (within pubspec.yaml spec).
3627
flutter(args: %w(packages upgrade))
3728
end
@@ -44,7 +35,9 @@ lane :update do
4435
if RUBY_PLATFORM.include? 'darwin'
4536
# These files will be automatically re-generated by the build.
4637
podfile_path = 'ios/Podfile'
47-
File.delete(podfile_path, "#{podfile_path}.lock")
38+
[podfile_path, "#{podfile_path}.lock"].each do |fn|
39+
File.delete(fn) if File.exist?(fn)
40+
end
4841
Dir.chdir('fastlane') do
4942
flutter_build(
5043
build: 'ios',
@@ -136,7 +129,9 @@ INFO
136129

137130
project_id = "#{product}-debug-#{_github_fork_name()}"
138131
sh %w(npm install)
139-
Dir.chdir('functions') { sh %w(npm install) }
132+
if File.directory?('functions')
133+
Dir.chdir('functions') { sh %w(npm install) }
134+
end
140135
fastlane_require 'shellwords'
141136
# Give Firebase login interactive mode and do not crop lines.
142137
exec %W(npm start -- #{project_id}).shelljoin

flutter/fastlane/Fastfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,12 @@ platform :ios do
281281
if lane_context[SharedValues::PROMOTE_RELEASE]
282282
retry_on_exception do
283283
upload_to_app_store(
284+
# Publishing to AppStore fails with message
285+
# Precheck cannot check In-app purchases with the App Store
286+
# Connect API Key
287+
# Therefore we set this property to false as described here:
288+
# https://github.com/fastlane/fastlane/issues/18250
289+
precheck_include_in_app_purchases: false,
284290
app_identifier: APP_IDENTIFIER,
285291
overwrite_screenshots: true,
286292
submit_for_review: true,

0 commit comments

Comments
 (0)