Skip to content

Commit 82c40f4

Browse files
authored
Merge pull request #1263 from forcedotcom/dev
RELEASE: @W-14573340@: Merging dev to release for v3.19.0
2 parents c55cbc6 + 4c8c171 commit 82c40f4

File tree

20 files changed

+2422
-1673
lines changed

20 files changed

+2422
-1673
lines changed

.github/ISSUE_TEMPLATE/4feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ assignees: ''
77
---
88

99
**Is your feature request related to an issue that you encountered with Salesforce Code Analyzer?**
10-
<!--Provide a clear and concise description of what the problem is. Example: When I run `scanner:run:describe`, I want to see a sorted list of commands.
10+
<!--Provide a clear and concise description of what the problem is. Example: When I run `scanner:run:describe`, I want to see a sorted list of commands.-->
1111

1212
**Describe the solution that you want:**
1313
<!--Describe the clear and concise description of the result that you expect from your feature request.-->

build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ plugins {
33
id("com.github.hierynomus.license") version "0.15.0"
44
}
55

6+
allprojects {
7+
task<Wrapper>("allWrappers") {
8+
gradleVersion = "7.2"
9+
}
10+
}
11+
612
subprojects {
713
version = "1.0"
814
}

cli-messaging/build.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ dependencies {
1414
implementation ("com.googlecode.json-simple:json-simple:1.1.1") {
1515
exclude("junit")
1616
}
17-
implementation("com.google.code.gson:gson:2.3")
18-
testImplementation("junit", "junit", "4.12")
19-
implementation("com.google.guava:guava:28.0-jre")
20-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
21-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
17+
implementation("com.google.code.gson:gson:2.10.1")
18+
implementation("com.google.guava:guava:31.1-jre")
19+
testImplementation("org.hamcrest:hamcrest:2.2")
20+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
21+
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.2")
22+
testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.2")
2223
}
2324

2425
tasks.getByName<Test>("test") {
2526
useJUnitPlatform()
27+
28+
testLogging {
29+
events("passed", "skipped", "failed")
30+
}
2631
}
4.24 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

cli-messaging/gradlew

Lines changed: 234 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli-messaging/gradlew.bat

Lines changed: 89 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli-messaging/settings.gradle.kts

Lines changed: 0 additions & 1 deletion
This file was deleted.

cli-messaging/src/main/java/com/salesforce/messaging/EventKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public enum EventKey {
3939
WARNING_GENERAL("warning.sfgeWarnLog", 1, MessageType.WARNING, MessageHandler.UX, true),
4040
WARNING_MULTIPLE_METHOD_TARGET_MATCHES("warning.multipleMethodTargetMatches", 3, MessageType.WARNING, MessageHandler.UX, false),
4141
WARNING_NO_METHOD_TARGET_MATCHES("warning.noMethodTargetMatches", 2, MessageType.WARNING, MessageHandler.UX, false),
42-
ERROR_GENERAL("error.internal.sfgeErrorLog", 1, MessageType.ERROR, MessageHandler.UX, false),
42+
ERROR_GENERAL("error.external.sfgeErrorLog", 1, MessageType.ERROR, MessageHandler.UX, false),
4343

4444
/** GENERAL PURPOSE */
4545
INFO_TELEMETRY("info.telemetry", 1, MessageType.TELEMETRY, MessageHandler.INTERNAL, false);

0 commit comments

Comments
 (0)