Skip to content

Commit 5c8d30a

Browse files
Merge branch 'dev' into rsh/spotbugsFixes
2 parents 43f0c9a + 756dae6 commit 5c8d30a

35 files changed

+796
-484
lines changed

.github/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8+
- package-ecosystem: gradle
9+
directory: "/android"
10+
schedule:
11+
interval: daily
12+
open-pull-requests-limit: 10
13+
- package-ecosystem: gradle
14+
directory: "/samples/deviceCodeSample"
15+
schedule:
16+
interval: daily
17+
open-pull-requests-limit: 10
18+
- package-ecosystem: gradle
19+
directory: "/samples/interactiveBrowserSample"
20+
schedule:
21+
interval: daily
22+
open-pull-requests-limit: 10
823
- package-ecosystem: maven
924
directory: "/"
1025
schedule:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
lint-api-level:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2.3.4
18+
- uses: actions/checkout@v2.4.0
1919
- uses: actions/setup-java@v2
2020
with:
2121
distribution: 'adopt'
22-
java-version: 16
22+
java-version: 17
2323
- name: Setup Android SDK
2424
uses: android-actions/[email protected]
2525
- name: Add execution right to the script

.github/workflows/build-and-publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
name: maven_central_snapshot
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v2.4.0
2424
- name: Easy detect-secrets
2525
uses: RobertFischer/[email protected]
2626
- name: Set up JDK
2727
uses: actions/setup-java@v2
2828
with:
29-
java-version: '16'
29+
java-version: 17
3030
distribution: 'adopt'
3131
cache: gradle
3232
- name: Download file
@@ -52,13 +52,13 @@ jobs:
5252
name: maven_central_release
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v2
55+
- uses: actions/checkout@v2.4.0
5656
- name: Easy detect-secrets
5757
uses: RobertFischer/[email protected]
5858
- name: Set up JDK
5959
uses: actions/setup-java@v2
6060
with:
61-
java-version: '16'
61+
java-version: 17
6262
distribution: 'adopt'
6363
cache: gradle
6464
- name: Download file
@@ -99,7 +99,7 @@ jobs:
9999
env:
100100
RELEASE_TAG: ""
101101
steps:
102-
- uses: actions/checkout@v2
102+
- uses: actions/checkout@v2.4.0
103103
- name: Get Version
104104
id: GetVersion
105105
run: .\scripts\getLatestVersion.ps1

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v2.3.4
20+
uses: actions/checkout@v2.4.0
2121
with:
2222
# We must fetch at least the immediate parents so that if this is
2323
# a pull request then we can checkout the head.
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/setup-java@v2
2727
with:
2828
distribution: 'adopt'
29-
java-version: 16
29+
java-version: 17
3030

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

.github/workflows/git-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
Git_Release:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v2.4.0
1414
- name: Download Build Artifact
15-
uses: dawidd6/action-download-artifact@v2.14.1
15+
uses: dawidd6/action-download-artifact@v2.16.0
1616
with:
1717
workflow: build-and-publish.yml
1818
workflow_conclusion: success
@@ -21,7 +21,7 @@ jobs:
2121
name: drop
2222
path: drop
2323
- name: Github Release
24-
uses: anton-yurchenko/git-release@v4.1
24+
uses: anton-yurchenko/git-release@v4.2
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
2727
DRAFT_RELEASE: "false"

.github/workflows/gradle-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
build:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 16
18+
- uses: actions/checkout@v2.4.0
19+
- name: Set up JDK
2020
uses: actions/setup-java@v2
2121
with:
22-
java-version: '16'
22+
java-version: 17
2323
distribution: 'adopt'
2424
cache: gradle
2525
- name: Easy detect-secrets

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
samples-build-check-device-code:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2.3.4
14+
- uses: actions/checkout@v2.4.0
1515
- uses: actions/setup-java@v2
1616
with:
1717
distribution: 'adopt'
18-
java-version: 16
18+
java-version: 17
1919
- name: Add execution right to the script
2020
run: chmod +x gradlew
2121
working-directory: ./samples/deviceCodeSample
@@ -25,11 +25,11 @@ jobs:
2525
samples-build-check-interactive:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v2.3.4
28+
- uses: actions/checkout@v2.4.0
2929
- uses: actions/setup-java@v2
3030
with:
3131
distribution: 'adopt'
32-
java-version: 16
32+
java-version: 17
3333
- name: Add execution right to the script
3434
run: chmod +x gradlew
3535
working-directory: ./samples/interactiveBrowserSample

.github/workflows/sonarcloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
name: Build
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v2.4.0
1717
with:
1818
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1919
- name: Set up JDK 11
2020
uses: actions/setup-java@v1
2121
with:
2222
java-version: 11
2323
- name: Cache SonarCloud packages
24-
uses: actions/[email protected].6
24+
uses: actions/[email protected].7
2525
with:
2626
path: ~/.sonar/cache
2727
key: ${{ runner.os }}-sonar
2828
restore-keys: ${{ runner.os }}-sonar
2929
- name: Cache Gradle packages
30-
uses: actions/[email protected].6
30+
uses: actions/[email protected].7
3131
with:
3232
path: ~/.gradle/caches
3333
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [2.0.10] - 2021-11-16
15+
16+
### Added
17+
18+
- Added support for cancelling requests #361
19+
20+
### Changed
21+
22+
- Fixed a bug where batching would fail for national clouds
23+
- Bumps Azure Core from 1.20.0 to 1.22.0 #359, #360, #341, #342
24+
- Bumps gson from 2.8.8 to 2.8.9 #356, #355
25+
- Bumps actions/checkout from 2.3.5 to 2.4.0 #358, #349
26+
- Upgrades CI pipeline to Java 17 #348, #330
27+
- Bumps mockito-inline from 3.12.4 to 4.0.0 #346, #345
28+
- Bumps action-download-artifact from 2.14.1 to 2.15.0 #344
29+
- Bumps okhttp from 4.9.1 to 4.9.2 #339, #340
30+
- Bumps guava from 30.1.1 to 31.0.1 #338, #337, #335, #336
31+
- Bumps junit-jupiter-api from 5.8.0 to 5.8.1 #332, #334
32+
- Bumps junit-jupiter-egine from 5.8.0 to 5.8.1 #333
33+
1434
## [2.0.9] - 2021-09-17
1535

1636
### Added

android/build.gradle

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

1010
dependencies {
11-
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.6"
12-
classpath "com.android.tools.build:gradle:4.1.3"
13-
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
11+
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.8"
12+
classpath "com.android.tools.build:gradle:7.0.4"
13+
classpath "com.github.ben-manes:gradle-versions-plugin:0.41.0"
1414
}
1515
}
1616

@@ -23,13 +23,13 @@ apply plugin: "com.android.library"
2323
apply plugin: "com.github.ben-manes.versions"
2424

2525
android {
26-
compileSdkVersion 31
26+
compileSdkVersion 32
2727

2828
defaultConfig {
2929
versionCode 1
3030
versionName "1.0"
3131
minSdkVersion 26
32-
targetSdkVersion 31
32+
targetSdkVersion 32
3333
}
3434

3535
buildTypes {

0 commit comments

Comments
 (0)