Skip to content

Commit 281547a

Browse files
authored
Merge branch 'main' into fix/platform-dispatcher-onerror
2 parents 7b9e707 + 633cf2e commit 281547a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/flutter.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ jobs:
187187
steps:
188188
- uses: actions/checkout@v3
189189
- uses: norio-nomura/action-swiftlint@9f4dcd7fd46b4e75d7935cf2f4df406d5cae3684 # [email protected]
190+
with:
191+
args: --strict
190192

191193
ktlint:
192194
runs-on: ubuntu-latest
@@ -202,6 +204,7 @@ jobs:
202204
github_token: ${{ secrets.github_token }}
203205
reporter: github-pr-review
204206
android: true
207+
fail_on_error: true
205208

206209
detekt:
207210
runs-on: ubuntu-latest
@@ -210,4 +213,4 @@ jobs:
210213
# To recreate baseline run: detekt -i flutter/android,flutter/example/android -b flutter/config/detekt-bl.xml -cb
211214
- uses: natiginfo/action-detekt-all@e01de6ff0eef7c24131e8a133bf598cfac6ceeab # [email protected]
212215
with:
213-
args: -i flutter/android,flutter/example/android --baseline flutter/config/detekt-bl.xml
216+
args: -i flutter/android,flutter/example/android --baseline flutter/config/detekt-bl.xml --jvm-target 1.8 --build-upon-default-config --all-rules

flutter/ios/Classes/SentryFlutterPluginApple.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
128128
}
129129
}
130130

131-
// swiftlint:disable:next cyclomatic_complexity
132131
private func loadContexts(result: @escaping FlutterResult) {
133132
SentrySDK.configureScope { scope in
134133
let serializedScope = scope.serialize()
@@ -173,7 +172,8 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
173172

174173
// Not reading the name from PrivateSentrySDKOnly.getSdkName because
175174
// this is added as a package and packages should follow the sentry-release-registry format
176-
infos["package"] = ["version": PrivateSentrySDKOnly.getSdkVersionString(), "sdk_name": "cocoapods:sentry-cocoa"]
175+
infos["package"] = ["version": PrivateSentrySDKOnly.getSdkVersionString(),
176+
"sdk_name": "cocoapods:sentry-cocoa"]
177177

178178
result(infos)
179179
}

0 commit comments

Comments
 (0)