Skip to content

Commit 31059ef

Browse files
Merge branch 'dev' into beta/pipelinebuild/55393
2 parents 5a1d1dc + 9364917 commit 31059ef

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/api-level-lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Checks the SDK only using APIs from the targeted API level"
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- dev

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "CodeQL"
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches: [dev, master]
67
pull_request:

gradle/dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ dependencies {
22
implementation 'com.google.guava:guava:30.1.1-jre'
33

44
// Use JUnit test framework
5-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
6-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
5+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0'
6+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.0'
77
testImplementation 'org.mockito:mockito-inline:3.12.4'
88

99
api 'com.google.code.gson:gson:2.8.8'

0 commit comments

Comments
 (0)