Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1448eb6
chore(deps): bump dependabot/fetch-metadata from 2.0.0 to 2.1.0
dependabot[bot] Apr 25, 2024
fd02ee8
Merge pull request #1586 from microsoftgraph/dependabot/github_action…
github-actions[bot] Apr 25, 2024
ef8eb7e
chore(deps): bump the kiota-dependencies group
dependabot[bot] Apr 26, 2024
9a129cc
Merge pull request #1588 from microsoftgraph/dependabot/gradle/androi…
github-actions[bot] Apr 26, 2024
68094e6
chore(deps): bump the kiota-dependencies group
dependabot[bot] Apr 29, 2024
3be3c04
chore(deps): bump the kiota-dependencies group with 7 updates
dependabot[bot] Apr 29, 2024
5841328
Merge pull request #1590 from microsoftgraph/dependabot/gradle/androi…
github-actions[bot] Apr 29, 2024
b559ec7
Merge pull request #1591 from microsoftgraph/dependabot/gradle/kiota-…
github-actions[bot] Apr 29, 2024
ef7f77c
chore(deps): bump com.android.tools.build:gradle in /android
dependabot[bot] May 1, 2024
1874803
- upgrades wrapper to 8.7
baywet May 1, 2024
0eda139
- upgrades wrapper to 8.7
baywet May 1, 2024
101cea0
Merge pull request #1592 from microsoftgraph/dependabot/gradle/androi…
github-actions[bot] May 1, 2024
b4ae5c8
chore(deps): bump com.github.spotbugs from 6.0.12 to 6.0.13
dependabot[bot] May 1, 2024
ff2d6b3
Merge pull request #1593 from microsoftgraph/dependabot/gradle/com.gi…
github-actions[bot] May 1, 2024
b0c4cf6
chore(deps): bump com.azure:azure-core from 1.48.0 to 1.49.0
dependabot[bot] May 3, 2024
c66708e
Merge pull request #1594 from microsoftgraph/dependabot/maven/com.azu…
github-actions[bot] May 3, 2024
c218ba5
chore(deps): bump com.azure:azure-core from 1.48.0 to 1.49.0
dependabot[bot] May 3, 2024
945c619
Merge pull request #1595 from microsoftgraph/dependabot/gradle/com.az…
github-actions[bot] May 3, 2024
b1c6ddb
chore(deps): bump com.github.spotbugs from 6.0.13 to 6.0.14
dependabot[bot] May 6, 2024
38c1201
Merge pull request #1596 from microsoftgraph/dependabot/gradle/com.gi…
github-actions[bot] May 6, 2024
8fa605f
chore(deps): bump com.github.spotbugs:spotbugs-annotations
dependabot[bot] May 6, 2024
0618416
Merge pull request #1597 from microsoftgraph/dependabot/maven/com.git…
github-actions[bot] May 6, 2024
04d8567
chore(deps): bump the kiota-dependencies group
dependabot[bot] May 8, 2024
bc30eef
chore(deps): bump the kiota-dependencies group with 7 updates
dependabot[bot] May 8, 2024
79696f5
Merge pull request #1598 from microsoftgraph/dependabot/gradle/androi…
github-actions[bot] May 8, 2024
6af2eab
Merge pull request #1599 from microsoftgraph/dependabot/gradle/kiota-…
github-actions[bot] May 8, 2024
a893d48
Downgrade jakarta.annotation-api dependency for java 8 compatibility
Ndiritu May 9, 2024
5b1d930
Bump Kiota libs
Ndiritu May 9, 2024
a763065
Bump lib version and update CHANGELOG
Ndiritu May 9, 2024
c8924b6
Merge pull request #1601 from microsoftgraph/fix/java-8
Ndiritu May 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2.0.0
uses: dependabot/fetch-metadata@v2.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

## [3.1.10] - 2024-05-09

### Changed

- Downgraded `jakarta.annotation-api` dependency to `2.1.1` for java 8 compatibility

## [3.1.9] - 2024-04-23

### Changed
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

dependencies {
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.17.2"
classpath "com.android.tools.build:gradle:8.3.2"
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.github.ben-manes:gradle-versions-plugin:0.51.0"
}
}
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id 'maven-publish'
id 'signing'
id 'jacoco'
id 'com.github.spotbugs' version '6.0.12'
id 'com.github.spotbugs' version '6.0.14'
id "org.sonarqube" version "5.0.0.4638"
}

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 = 3
mavenMinorVersion = 1
mavenPatchVersion = 9
mavenPatchVersion = 10
mavenArtifactSuffix =

#These values are used to run functional tests
Expand Down
18 changes: 9 additions & 9 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ dependencies {
testImplementation 'io.github.std-uritemplate:std-uritemplate:0.0.57'
implementation 'com.google.code.gson:gson:2.10.1'

implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0'
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'

api 'com.squareup.okhttp3:okhttp:4.12.0'
api 'com.azure:azure-core:1.48.0'
api 'com.azure:azure-core:1.49.0'

api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.7'
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.7'
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.7'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.7'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.7'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.7'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.7'
api 'com.microsoft.kiota:microsoft-kiota-abstractions:1.1.11'
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.1.11'
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.1.11'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:1.1.11'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:1.1.11'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-form:1.1.11'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.1.11'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.48.0</version>
<version>1.49.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.8.4</version>
<version>4.8.5</version>
</dependency>
</dependencies>
</project>
12 changes: 6 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repositories {

dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph-core:3.1.6'
implementation 'com.microsoft.graph:microsoft-graph-core:3.1.10'
// This dependency is only needed if you are using the TokenCredentialAuthProvider
implementation 'com.azure:azure-identity:1.11.0'
}
Expand All @@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
<!-- Include the sdk as a dependency -->
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph-core</artifactId>
<version>3.1.6</version>
<version>3.1.10</version>
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
Expand Down Expand Up @@ -85,9 +85,9 @@ client.newCall(request).enqueue(new Callback() {
@Override
public void onResponse(Call call, Response response) throws IOException {
String responseBody = response.body().string();
// Your processing with the response body
// Your processing with the response body
}

@Override
public void onFailure(Call call, IOException e) {
e.printStackTrace();
Expand All @@ -106,9 +106,9 @@ client.newCall(request).enqueue(new Callback() {
@Override
public void onResponse(Call call, Response response) throws IOException {
String responseBody = response.body().string();
// Your processing with the response body
// Your processing with the response body
}

@Override
public void onFailure(Call call, IOException e) {
e.printStackTrace();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/core/CoreConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private CoreConstants() {}
private static class VersionValues {
private static final int MAJOR = 3;
private static final int MINOR = 1;
private static final int PATCH = 9;
private static final int PATCH = 10;
}

/**
Expand Down