Skip to content

Commit

Permalink
Merge pull request #730 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
master refresh
  • Loading branch information
baywet authored Jan 19, 2023
2 parents b8ef1cc + 99f859e commit e07a4af
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez
* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez @andrueastman
2 changes: 1 addition & 1 deletion .github/workflows/api-level-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
distribution: 'adopt'
java-version: 18
- name: Setup Android SDK
uses: android-actions/[email protected].9
uses: android-actions/[email protected].10
- name: Add execution right to the script
run: chmod +x gradlew
working-directory: ./android
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
run: .\scripts\getLatestVersion.ps1
shell: pwsh
- name: Create tag
uses: rickstaa/action-create-tag@v1.3.9
uses: rickstaa/action-create-tag@v1.5.4
with:
tag: ${{ steps.GetVersion.outputs.tag }}
- name: Queue Git Release
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,12 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 18

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/git-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Download Build Artifact
uses: dawidd6/[email protected].0
uses: dawidd6/[email protected].3
with:
workflow: build-and-publish.yml
workflow_conclusion: success
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/projectsbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06
uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
with:
app_id: ${{ secrets.GRAPHBOT_APP_ID }}
private_key: ${{ secrets.GRAPHBOT_APP_PEM }}
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ buildscript {
}

dependencies {
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.11.2"
classpath "com.android.tools.build:gradle:7.3.1"
classpath "com.github.ben-manes:gradle-versions-plugin:0.43.0"
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.2"
classpath "com.android.tools.build:gradle:7.4.0"
classpath "com.github.ben-manes:gradle-versions-plugin:0.44.0"
}
}

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ plugins {
id 'maven-publish'
id 'signing'
id 'jacoco'
id 'com.github.spotbugs' version '5.0.12'
id "org.sonarqube" version "3.4.0.2513"
id 'com.github.spotbugs' version '5.0.13'
id "org.sonarqube" version "3.5.0.2730"
}

java {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph-core
mavenMajorVersion = 2
mavenMinorVersion = 0
mavenPatchVersion = 14
mavenPatchVersion = 15
mavenArtifactSuffix =

#These values are used to run functional tests
Expand Down
18 changes: 8 additions & 10 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
dependencies {
// Use JUnit test framework
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
testImplementation 'org.mockito:mockito-inline:4.8.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testImplementation 'org.mockito:mockito-inline:5.0.0'

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

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

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

compileOnly 'net.jcip:jcip-annotations:1.0'
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.3'
testCompileOnly 'net.jcip:jcip-annotations:1.0'
testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.2'
api 'net.jcip:jcip-annotations:1.0'
api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
}
15 changes: 10 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.1</version>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -35,25 +35,30 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.33.0</version>
<version>1.35.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.8.0</version>
<version>5.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.7.3</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion samples/deviceCodeSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ repositories {
dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
implementation project(':coreLibrary')
implementation 'com.azure:azure-identity:1.6.1'
implementation 'com.azure:azure-identity:1.7.3'
}
2 changes: 1 addition & 1 deletion samples/interactiveBrowserSample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ repositories {
dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
implementation project(':coreLibrary')
implementation 'com.azure:azure-identity:1.6.1'
implementation 'com.azure:azure-identity:1.7.3'
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.io.IOException;
import java.lang.reflect.Field;
import java.util.Objects;

import javax.annotation.Nonnull;

Expand All @@ -25,9 +24,9 @@ public class TelemetryHandler implements Interceptor{
/**
* Current SDK version
*/
public static final String VERSION = "v2.0.14";
public static final String VERSION = "v2.0.15";
/**
* Verion prefix
* Version prefix
*/
public static final String GRAPH_VERSION_PREFIX = "graph-java-core";
/**
Expand Down

0 comments on commit e07a4af

Please sign in to comment.