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
7b329ad
Bump com.gradle:gradle-enterprise-gradle-plugin in /android
dependabot[bot] Mar 21, 2023
dd4323c
Merge pull request #776 from microsoftgraph/dependabot/gradle/android…
baywet Mar 21, 2023
bd17dcc
Bump com.github.spotbugs in /samples/deviceCodeSample
dependabot[bot] Mar 22, 2023
ccbcc1d
Bump com.github.spotbugs in /samples/interactiveBrowserSample
dependabot[bot] Mar 22, 2023
48049b6
Merge pull request #778 from microsoftgraph/dependabot/gradle/samples…
baywet Mar 22, 2023
8a299d1
Merge pull request #779 from microsoftgraph/dependabot/gradle/samples…
baywet Mar 22, 2023
86435c7
Bump com.gradle:gradle-enterprise-gradle-plugin in /android
dependabot[bot] Mar 27, 2023
90183fe
Merge pull request #780 from microsoftgraph/dependabot/gradle/android…
baywet Mar 27, 2023
f56224a
Bump dawidd6/action-download-artifact from 2.26.0 to 2.26.1
dependabot[bot] Apr 5, 2023
c8cb3f2
Merge pull request #782 from microsoftgraph/dependabot/github_actions…
andrueastman Apr 5, 2023
f8bd551
Replace @Nullable annotations with @Nonnull in BaseRequestBuilder
mspiess Apr 5, 2023
4c1a62e
Update dependabot.yml
ramsessanchez Apr 7, 2023
7f299d0
Merge pull request #787 from microsoftgraph/dependabot-hotfix
ramsessanchez Apr 7, 2023
84e8352
Bump com.azure:azure-core from 1.37.0 to 1.38.0
dependabot[bot] Apr 10, 2023
6336967
Bump azure-core from 1.37.0 to 1.38.0
dependabot[bot] Apr 10, 2023
b7b3c0a
Bump com.azure:azure-core from 1.37.0 to 1.38.0 in /android
dependabot[bot] Apr 10, 2023
266c810
Merge pull request #794 from microsoftgraph/dependabot/gradle/android…
baywet Apr 10, 2023
0bdb761
Merge pull request #793 from microsoftgraph/dependabot/maven/com.azur…
baywet Apr 10, 2023
22f3ad4
Merge pull request #792 from microsoftgraph/dependabot/gradle/com.azu…
baywet Apr 10, 2023
a07fa08
Bump com.azure:azure-identity in /samples/deviceCodeSample
dependabot[bot] Apr 11, 2023
372d2da
Merge pull request #799 from microsoftgraph/dependabot/gradle/samples…
baywet Apr 11, 2023
8f7397d
Bump com.azure:azure-identity in /samples/interactiveBrowserSample
dependabot[bot] Apr 11, 2023
1ee00f7
Merge pull request #798 from microsoftgraph/dependabot/gradle/samples…
baywet Apr 11, 2023
5413b87
Bump com.gradle:gradle-enterprise-gradle-plugin in /android
dependabot[bot] Apr 13, 2023
d119a75
Merge pull request #800 from microsoftgraph/dependabot/gradle/android…
baywet Apr 13, 2023
62a0232
Bump dawidd6/action-download-artifact from 2.26.1 to 2.27.0
dependabot[bot] Apr 14, 2023
df50827
Merge pull request #803 from microsoftgraph/dependabot/github_actions…
baywet Apr 14, 2023
7b6ab90
Merge pull request #784 from mspiess/issue-783
baywet Apr 14, 2023
e8dce91
Tooling
ramsessanchez Apr 17, 2023
404dbfb
Merge pull request #808 from microsoftgraph/gradle_tooling_bump
ramsessanchez Apr 17, 2023
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/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ updates:
schedule:
interval: daily
open-pull-requests-limit: 10
- package-ecosystem: maven
- package-ecosystem: maven
directory: "/"
target-branch: v3/longTermBranch
schedule:
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/action-download-artifact@v2.26.0
uses: dawidd6/action-download-artifact@v2.27.0
with:
workflow: build-and-publish.yml
workflow_conclusion: success
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

## [2.0.18] - 2023-04-06

### Changed

- Fix `getRequestUrl()` and `getClient()` wrongfully being declared `@Nullable` in `BaseRequestBuilder`.

## [2.0.17] - 2023-03-20

### Changed
Expand Down
1 change: 0 additions & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.microsoft.graph"
android:installLocation="auto"
tools:ignore="UnusedAttribute">

Expand Down
6 changes: 4 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ buildscript {
}

dependencies {
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
classpath "com.android.tools.build:gradle:7.4.2"
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
classpath "com.android.tools.build:gradle:8.0.0"
classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
}
}
Expand All @@ -23,6 +23,8 @@ apply plugin: "com.android.library"
apply plugin: "com.github.ben-manes.versions"

android {
namespace "com.microsoft.graph"

compileSdkVersion 33

defaultConfig {
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 0 additions & 6 deletions android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

Expand All @@ -38,7 +38,7 @@ spotbugsMain {
excludeFilter = file("spotBugsExcludeFilter.xml")
reports {
html {
enabled = true
required
destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
stylesheet = 'fancy-hist.xsl'
}
Expand All @@ -49,7 +49,7 @@ spotbugsTest {
excludeFilter = file("spotBugsExcludeFilter.xml")
reports {
html {
enabled = true
required
destination = file("$buildDir/reports/spotbugs/test/spotbugs.html")
stylesheet = 'fancy-hist.xsl'
}
Expand All @@ -58,7 +58,7 @@ spotbugsTest {

jacocoTestReport {
reports {
xml.enabled true
xml.required
}
}

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 = 17
mavenPatchVersion = 18
mavenArtifactSuffix =

#These values are used to run functional tests
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation 'com.google.guava:guava:31.1-jre'

implementation 'com.google.code.gson:gson:2.10.1'
api 'com.azure:azure-core:1.37.0'
api 'com.azure:azure-core:1.38.0'

api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
}
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 0 additions & 6 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.37.0</version>
<version>1.38.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
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.8.1'
implementation 'com.azure:azure-identity:1.8.2'
}
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.8.1'
implementation 'com.azure:azure-identity:1.8.2'
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public BaseRequestBuilder(
*
* @return the client
*/
@Nullable
@Nonnull
@SuppressFBWarnings
public IBaseClient<?> getClient() {
return client;
Expand All @@ -90,7 +90,7 @@ public IBaseClient<?> getClient() {
*
* @return the request URL
*/
@Nullable
@Nonnull
public String getRequestUrl() {
return requestUrl;
}
Expand Down