Skip to content

Commit 472ec18

Browse files
authored
Merge branch 'dev' into feature/java-16
2 parents 30a6977 + 904b1de commit 472ec18

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v2
18-
- uses: actions/setup-java@v1
18+
- uses: actions/setup-java@v2
1919
with:
20+
distribution: 'adopt'
2021
java-version: 16
2122
- name: Setup Android SDK
2223
uses: android-actions/setup-android@v2

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222
# a pull request then we can checkout the head.
2323
fetch-depth: 2
2424

25-
- uses: actions/setup-java@v1
25+
- uses: actions/setup-java@v2
2626
with:
27+
distribution: 'adopt'
2728
java-version: 16
2829

2930
# If this run was triggered by a pull request event, then checkout

.github/workflows/sample-build-check.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: actions/setup-java@v1
14+
- uses: actions/setup-java@v2
1515
with:
16+
distribution: 'adopt'
1617
java-version: 16
1718
- name: Add execution right to the script
1819
run: chmod +x gradlew
@@ -24,8 +25,9 @@ jobs:
2425
runs-on: ubuntu-latest
2526
steps:
2627
- uses: actions/checkout@v2
27-
- uses: actions/setup-java@v1
28+
- uses: actions/setup-java@v2
2829
with:
30+
distribution: 'adopt'
2931
java-version: 16
3032
- name: Add execution right to the script
3133
run: chmod +x gradlew

gradle/dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies {
66

77
api 'com.squareup.okhttp3:okhttp:4.9.1'
88

9-
implementation 'com.google.guava:guava:30.1-jre'
9+
implementation 'com.google.guava:guava:30.1.1-jre'
1010

1111
implementation 'com.google.code.gson:gson:2.8.6'
12-
api 'com.azure:azure-identity:1.2.4'
12+
api 'com.azure:azure-identity:1.2.5'
1313
}

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Get started with the Microsoft Graph Core SDK for Java by integrating the [Micro
44

55
## Samples and usage guide
66

7-
- [Middleware usage](https://github.com/microsoftgraph/msgraph-sdk-java-core/wiki)
8-
- [Batching](https://github.com/microsoftgraph/msgraph-sdk-java-core/wiki/Batching)
7+
- [Middleware usage](https://github.com/microsoftgraph/msgraph-sdk-design/)
8+
- [Batching](https://docs.microsoft.com/en-us/graph/sdks/batch-requests?tabs=java)
99

1010
## 1. Installation
1111

0 commit comments

Comments
 (0)