Merge pull request #807 from microsoftgraph/dev

baywet · web-flow · commit 32c782659ef4 · 2023-04-17T16:50:26.000-04:00
2.0.18 release
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -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:
diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -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">
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -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"
     }
 }
@@ -23,6 +23,8 @@ apply plugin: "com.android.library"
 apply plugin: "com.github.ben-manes.versions"
 
 android {
+    namespace "com.microsoft.graph"
+
     compileSdkVersion 33
 
     defaultConfig {
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/android/gradlew b/android/gradlew
diff --git a/android/gradlew.bat b/android/gradlew.bat
diff --git a/build.gradle b/build.gradle
@@ -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"
 }
 
@@ -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'
         }
@@ -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'
         }
@@ -58,7 +58,7 @@ spotbugsTest {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -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
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -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'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/pom.xml b/pom.xml
@@ -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>
diff --git a/samples/deviceCodeSample/build.gradle b/samples/deviceCodeSample/build.gradle
@@ -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'
 }
diff --git a/samples/interactiveBrowserSample/build.gradle b/samples/interactiveBrowserSample/build.gradle
@@ -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'
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
@@ -79,7 +79,7 @@ public BaseRequestBuilder(
      *
      * @return the client
      */
-    @Nullable
+    @Nonnull
     @SuppressFBWarnings
     public IBaseClient<?> getClient() {
         return client;
@@ -90,7 +90,7 @@ public IBaseClient<?> getClient() {
      *
      * @return the request URL
      */
-    @Nullable
+    @Nonnull
     public String getRequestUrl() {
         return requestUrl;
     }

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"`
`12`		`- classpath "com.android.tools.build:gradle:7.4.2"`
	`11`	`+ classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"`
	`12`	`+ classpath "com.android.tools.build:gradle:8.0.0"`
`13`	`13`	`classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -23,6 +23,8 @@ apply plugin: "com.android.library"`
`23`	`23`	`apply plugin: "com.github.ben-manes.versions"`
`24`	`24`
`25`	`25`	`android {`
	`26`	`+ namespace "com.microsoft.graph"`
	`27`	`+`
`26`	`28`	`compileSdkVersion 33`
`27`	`29`
`28`	`30`	`defaultConfig {`