Skip to content

Commit

Permalink
refactor: migrate to Flutter 3.13.6 (#1077)
Browse files Browse the repository at this point in the history
  • Loading branch information
ookami-kb authored Sep 29, 2023
1 parent a899dc2 commit 3a16a6b
Show file tree
Hide file tree
Showing 64 changed files with 636 additions and 584 deletions.
4 changes: 2 additions & 2 deletions .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "3.10.5",
"flutterSdkVersion": "3.13.6",
"flavors": {}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/check_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ concurrency:
cancel-in-progress: true

env:
FLUTTER_VERSION: "3.10.5"
DART_VERSION: "3.0.5"
FLUTTER_VERSION: "3.13.6"
DART_VERSION: "3.1.3"

jobs:
formatting:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true

env:
FLUTTER_VERSION: "3.10.5"
FLUTTER_VERSION: "3.13.6"

jobs:
e2e:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solana_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true

env:
FLUTTER_VERSION: "3.10.5"
FLUTTER_VERSION: "3.13.6"

jobs:
solana_coverage:
Expand Down
4 changes: 2 additions & 2 deletions codemagic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ workflows:
groups:
- common
- google_credentials
flutter: 3.10.5
xcode: 14.2
flutter: 3.13.6
xcode: 15.0
android_signing:
- app
ios_signing:
Expand Down
2 changes: 1 addition & 1 deletion packages/espressocash_app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.9.0'
repositories {
google()
jcenter()
Expand Down
21 changes: 21 additions & 0 deletions packages/espressocash_app/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,24 @@ post_install do |installer|
end
end
end

# https://github.com/pichillilorenzo/flutter_inappwebview/issues/1807#issuecomment-1738699112
post_integrate do |installer|
compiler_flags_key = 'COMPILER_FLAGS'
project_path = 'Pods/Pods.xcodeproj'

project = Xcodeproj::Project.open(project_path)
project.targets.each do |target|
target.build_phases.each do |build_phase|
if build_phase.is_a?(Xcodeproj::Project::Object::PBXSourcesBuildPhase)
build_phase.files.each do |file|
if !file.settings.nil? && file.settings.key?(compiler_flags_key)
compiler_flags = file.settings[compiler_flags_key]
file.settings[compiler_flags_key] = compiler_flags.gsub(/-DOS_OBJECT_USE_OBJC=0\s*/, '')
end
end
end
end
end
project.save()
end
Loading

0 comments on commit 3a16a6b

Please sign in to comment.