Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RUMM-1222 Update to swiftlint 0.43.x #453

Merged
merged 1 commit into from
Mar 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Datadog/Datadog.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class Datadog {
/// If set, a debugging outline will be displayed on top of the application, describing the name of the active RUM View.
/// May be used to debug issues with RUM instrumentation in your app.
/// Default is `false`.
public static var debugRUM: Bool = false {
public static var debugRUM = false {
didSet {
(Global.rum as? RUMMonitor)?.enableRUMDebugging(debugRUM)
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Datadog/RUM/RUMMonitor/Scopes/RUMViewScope.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
/// Tells if this View is the active one.
/// `true` for every new started View.
/// `false` if the View was stopped or any other View was started.
private(set) var isActiveView: Bool = true
private(set) var isActiveView = true
/// Tells if this scope has received the "start" command.
/// If `didReceiveStartCommand == true` and another "start" command is received for this View this scope is marked as inactive.
private var didReceiveStartCommand = false
Expand Down
20 changes: 10 additions & 10 deletions tools/lint/sources.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set of Swift Lint rules enforced for Swift code under `Sources/*` directory

whitelist_rules: # we enable lint rules explicitly - only the ones listed below are active
only_rules: # we enable lint rules explicitly - only the ones listed below are active
- attributes
- closing_brace
- closure_end_indentation
Expand Down Expand Up @@ -90,12 +90,12 @@ custom_rules:
severity: error

included:
- Sources
- instrumented-tests/http-server-mock/Sources
- tools/api-surface/Sources
- tools/api-surface/Fixtures/Sources
- tools/rum-models-generator/Sources
- tools/rum-models-generator/Tests/rum-models-generator-coreTests/Fixtures/Output # lint generation fixture
- dependency-manager-tests/carthage/CTProject
- dependency-manager-tests/cocoapods/CPProject
- dependency-manager-tests/spm/SPMProject
- ../../Sources
- ../../instrumented-tests/http-server-mock/Sources
- ../../tools/api-surface/Sources
- ../../tools/api-surface/Fixtures/Sources
- ../../tools/rum-models-generator/Sources
- ../../tools/rum-models-generator/Tests/rum-models-generator-coreTests/Fixtures/Output # lint generation fixture
- ../../dependency-manager-tests/carthage/CTProject
- ../../dependency-manager-tests/cocoapods/CPProject
- ../../dependency-manager-tests/spm/SPMProject
22 changes: 11 additions & 11 deletions tools/lint/tests.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set of Swift Lint rules enforced for Swift code under `Tests/*` directory

whitelist_rules: # we enable lint rules explicitly - only the ones listed below are active
only_rules: # we enable lint rules explicitly - only the ones listed below are active
- attributes
- closing_brace
- closure_end_indentation
Expand Down Expand Up @@ -75,13 +75,13 @@ custom_rules:
severity: error

included:
- Tests
- instrumented-tests/http-server-mock/Tests
- tools/api-surface/Tests
- tools/rum-models-generator/Tests
- dependency-manager-tests/carthage/CTProjectTests
- dependency-manager-tests/carthage/CTProjectUITests
- dependency-manager-tests/cocoapods/CTProjectTests
- dependency-manager-tests/cocoapods/CTProjectUITests
- dependency-manager-tests/spm/SPMProjectTests
- dependency-manager-tests/spm/SPMProjectUITests
- ../../Tests
- ../../instrumented-tests/http-server-mock/Tests
- ../../tools/api-surface/Tests
- ../../tools/rum-models-generator/Tests
- ../../dependency-manager-tests/carthage/CTProjectTests
- ../../dependency-manager-tests/carthage/CTProjectUITests
- ../../dependency-manager-tests/cocoapods/CTProjectTests
- ../../dependency-manager-tests/cocoapods/CTProjectUITests
- ../../dependency-manager-tests/spm/SPMProjectTests
- ../../dependency-manager-tests/spm/SPMProjectUITests