Skip to content

Commit 33d16d5

Browse files
committed
Merge remote-tracking branch 'origin/dev' into feature/AuthProviderWithHosts
2 parents fcb9eea + 44af825 commit 33d16d5

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/sonarcloud.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
- uses: actions/checkout@v3
1717
with:
1818
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
19-
- name: Set up JDK 11
19+
- name: Set up JDK
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: 11
22+
java-version: 17
23+
distribution: 'adopt'
24+
cache: gradle
2325
- name: Cache SonarCloud packages
2426
uses: actions/cache@v3
2527
with:
@@ -36,4 +38,4 @@ jobs:
3638
env:
3739
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3840
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
39-
run: ./gradlew build sonarqube --info
41+
run: ./gradlew build sonarqube --info

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.9"
11+
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.10"
1212
classpath "com.android.tools.build:gradle:7.1.3"
1313
classpath "com.github.ben-manes:gradle-versions-plugin:0.42.0"
1414
}

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.8.2'
44
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
55
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
6-
testImplementation 'org.mockito:mockito-inline:4.4.0'
6+
testImplementation 'org.mockito:mockito-inline:4.5.0'
77

88
api 'com.squareup.okhttp3:okhttp:4.9.3'
99

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>org.mockito</groupId>
5454
<artifactId>mockito-inline</artifactId>
55-
<version>4.4.0</version>
55+
<version>4.5.0</version>
5656
<scope>test</scope>
5757
</dependency>
5858
</dependencies>

0 commit comments

Comments
 (0)