Skip to content

Commit 6110bcf

Browse files
authored
Merge pull request #173 from microsoftgraph/feature/java-16
- moves to java 16 for CI
2 parents ff8c1f3 + daddec1 commit 6110bcf

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.azure-pipelines/templates/install-java.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
steps:
2-
- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
2+
- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.zip -OutFile OpenJDK.zip'
33
displayName: 'Download JDK'
44

55
- task: JavaToolInstaller@0
66
inputs:
7-
versionSpec: '15'
7+
versionSpec: '16'
88
jdkArchitectureOption: 'x64'
99
jdkSourceOption: 'LocalDirectory'
1010
jdkFile: 'OpenJDK.zip'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v2
1919
with:
2020
distribution: 'adopt'
21-
java-version: 15
21+
java-version: 16
2222
- name: Setup Android SDK
2323
uses: android-actions/setup-android@v2
2424
- name: Add execution right to the script

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-java@v2
2626
with:
2727
distribution: 'adopt'
28-
java-version: 15
28+
java-version: 16
2929

3030
# If this run was triggered by a pull request event, then checkout
3131
# the head of the pull request instead of the merge commit.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-java@v2
1515
with:
1616
distribution: 'adopt'
17-
java-version: 15
17+
java-version: 16
1818
- name: Add execution right to the script
1919
run: chmod +x gradlew
2020
working-directory: ./samples/deviceCodeSample
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/setup-java@v2
2929
with:
3030
distribution: 'adopt'
31-
java-version: 15
31+
java-version: 16
3232
- name: Add execution right to the script
3333
run: chmod +x gradlew
3434
working-directory: ./samples/interactiveBrowserSample

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.5"
12-
classpath "com.android.tools.build:gradle:4.0.1"
11+
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.6"
12+
classpath "com.android.tools.build:gradle:4.1.3"
1313
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
1414
}
1515
}
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.8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
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.8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)