Skip to content

Commit e07a4af

Browse files
authored
Merge pull request #730 from microsoftgraph/dev
master refresh
2 parents b8ef1cc + 99f859e commit e07a4af

File tree

14 files changed

+33
-40
lines changed

14 files changed

+33
-40
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez
1+
* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez @andrueastman

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
distribution: 'adopt'
2222
java-version: 18
2323
- name: Setup Android SDK
24-
uses: android-actions/[email protected].9
24+
uses: android-actions/[email protected].10
2525
- name: Add execution right to the script
2626
run: chmod +x gradlew
2727
working-directory: ./android

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: .\scripts\getLatestVersion.ps1
106106
shell: pwsh
107107
- name: Create tag
108-
uses: rickstaa/action-create-tag@v1.3.9
108+
uses: rickstaa/action-create-tag@v1.5.4
109109
with:
110110
tag: ${{ steps.GetVersion.outputs.tag }}
111111
- name: Queue Git Release

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,12 @@ jobs:
1818
steps:
1919
- name: Checkout repository
2020
uses: actions/checkout@v3
21-
with:
22-
# We must fetch at least the immediate parents so that if this is
23-
# a pull request then we can checkout the head.
24-
fetch-depth: 2
2521

2622
- uses: actions/setup-java@v3
2723
with:
2824
distribution: 'adopt'
2925
java-version: 18
3026

31-
# If this run was triggered by a pull request event, then checkout
32-
# the head of the pull request instead of the merge commit.
33-
- run: git checkout HEAD^2
34-
if: ${{ github.event_name == 'pull_request' }}
35-
3627
# Initializes the CodeQL tools for scanning.
3728
- name: Initialize CodeQL
3829
uses: github/codeql-action/init@v2

.github/workflows/git-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Download Build Artifact
15-
uses: dawidd6/[email protected].0
15+
uses: dawidd6/[email protected].3
1616
with:
1717
workflow: build-and-publish.yml
1818
workflow_conclusion: success

.github/workflows/projectsbot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Generate token
1212
id: generate_token
13-
uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06
13+
uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
1414
with:
1515
app_id: ${{ secrets.GRAPHBOT_APP_ID }}
1616
private_key: ${{ secrets.GRAPHBOT_APP_PEM }}

android/build.gradle

Lines changed: 3 additions & 3 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.11.2"
12-
classpath "com.android.tools.build:gradle:7.3.1"
13-
classpath "com.github.ben-manes:gradle-versions-plugin:0.43.0"
11+
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.2"
12+
classpath "com.android.tools.build:gradle:7.4.0"
13+
classpath "com.github.ben-manes:gradle-versions-plugin:0.44.0"
1414
}
1515
}
1616

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ plugins {
1414
id 'maven-publish'
1515
id 'signing'
1616
id 'jacoco'
17-
id 'com.github.spotbugs' version '5.0.12'
18-
id "org.sonarqube" version "3.4.0.2513"
17+
id 'com.github.spotbugs' version '5.0.13'
18+
id "org.sonarqube" version "3.5.0.2730"
1919
}
2020

2121
java {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mavenGroupId = com.microsoft.graph
2525
mavenArtifactId = microsoft-graph-core
2626
mavenMajorVersion = 2
2727
mavenMinorVersion = 0
28-
mavenPatchVersion = 14
28+
mavenPatchVersion = 15
2929
mavenArtifactSuffix =
3030

3131
#These values are used to run functional tests

gradle/dependencies.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
dependencies {
22
// Use JUnit test framework
3-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
4-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
5-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
6-
testImplementation 'org.mockito:mockito-inline:4.8.0'
3+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
4+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
5+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
6+
testImplementation 'org.mockito:mockito-inline:5.0.0'
77

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

1010
implementation 'com.google.guava:guava:31.1-jre'
1111

12-
implementation 'com.google.code.gson:gson:2.9.1'
13-
api 'com.azure:azure-core:1.33.0'
12+
implementation 'com.google.code.gson:gson:2.10.1'
13+
api 'com.azure:azure-core:1.35.0'
1414

15-
compileOnly 'net.jcip:jcip-annotations:1.0'
16-
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.3'
17-
testCompileOnly 'net.jcip:jcip-annotations:1.0'
18-
testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.2'
15+
api 'net.jcip:jcip-annotations:1.0'
16+
api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
1917
}

0 commit comments

Comments
 (0)