Skip to content

Commit cbbcdb9

Browse files
authored
Merge pull request #1731 from microsoftgraph/1723-replace-mockito-inline-by-mockito-core
Updates Java version to 21 in workflows and Mockito from inline to core
2 parents b7cfbe0 + e4231a0 commit cbbcdb9

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/setup-java@v4
1616
with:
1717
distribution: 'temurin'
18-
java-version: 20
18+
java-version: 21
1919
cache: gradle
2020
- name: Setup Android SDK
2121
uses: android-actions/[email protected]

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set up JDK
4848
uses: actions/setup-java@v4
4949
with:
50-
java-version: 20
50+
java-version: 21
5151
distribution: 'temurin'
5252
cache: gradle
5353

.github/workflows/gradle-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up JDK
1414
uses: actions/setup-java@v4
1515
with:
16-
java-version: 20
16+
java-version: 21
1717
distribution: 'temurin'
1818
cache: gradle
1919
- name: Detect secrets

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up JDK
3333
uses: actions/setup-java@v4
3434
with:
35-
java-version: 20
35+
java-version: 21
3636
distribution: 'temurin'
3737
cache: gradle
3838
- name: Cache SonarCloud packages

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
44
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
55
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0'
6-
testImplementation 'org.mockito:mockito-inline:5.2.0'
6+
testImplementation 'org.mockito:mockito-core:5.13.0'
77
testImplementation 'io.opentelemetry:opentelemetry-api:1.41.0'
88
testImplementation 'io.opentelemetry:opentelemetry-context:1.41.0'
99
testImplementation 'io.github.std-uritemplate:std-uritemplate:1.0.6'

0 commit comments

Comments
 (0)