Skip to content

Commit 6756c1b

Browse files
authored
Merge branch 'flutter' into dependabot/gradle/android/org.jetbrains.kotlin.android-2.2.21
2 parents f993f08 + 377686b commit 6756c1b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.github/actions/windows/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ runs:
4040
run: |
4141
choco install innosetup --version=6.4.0 -y
4242
$iscc = "${env:ProgramFiles(x86)}\Inno Setup 6\iscc.exe"
43+
# Remove missing Icelandic language include if present to avoid build failure
44+
$issPath = "build\windows\x64\installer\Release\inno-script.iss"
45+
if (Test-Path $issPath) {
46+
(Get-Content $issPath) | Where-Object { $_ -notmatch 'Icelandic\.isl' } | Set-Content $issPath
47+
}
4348
& "$iscc" /O+ "build\windows\x64\installer\Release\inno-script.iss"
4449
4550
- name: Store Installer

macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@
6565
"version" : 1,
6666
"author" : "xcode"
6767
}
68+
,
69+
"properties" : {
70+
"template-rendering-intent" : "template"
71+
}
6872
}

0 commit comments

Comments
 (0)