Skip to content

Commit

Permalink
Merge pull request #1471 from microsoftgraph/v1.0/pipelinebuild/117217
Browse files Browse the repository at this point in the history
Generated  models and request builders
  • Loading branch information
ramsessanchez authored Jun 16, 2023
2 parents add5797 + 6c46b2d commit 2ea4bc7
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 8 deletions.
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

## [5.61.0] - 2023-06-16

### Changed

- Generated v1.0 models and request builders using Typewriter.

## [5.60.0] - 2023-06-09

### Added
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph:5.60.0'
implementation 'com.microsoft.graph:microsoft-graph:5.61.0'
// Uncomment the line below if you are building an android application
//implementation 'com.google.guava:guava:30.1.1-android'
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
Expand All @@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
<!-- Include the sdk as a dependency -->
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>5.60.0</version>
<version>5.61.0</version>
</dependency>
<dependency>
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
Expand Down Expand Up @@ -191,5 +191,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI






4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ apply plugin: "com.github.ben-manes.versions"
android {
namespace 'com.microsoft.graph'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
versionCode 1
versionName "1.0"
minSdkVersion 26
targetSdkVersion 33
targetSdkVersion 34
}

buildTypes {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ org.gradle.caching=true
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 5
mavenMinorVersion = 60
mavenMinorVersion = 61
mavenPatchVersion = 0
mavenArtifactSuffix =

Expand Down Expand Up @@ -114,5 +114,6 @@ mavenCentralPublishingEnabled=false






3 changes: 2 additions & 1 deletion src/main/java/com/microsoft/graph/info/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ private Constants() {
/** The client secret to use for unit testing */
public static final String CLIENTSECRET = "clientsecret";
/** The SDK version */
public static final String VERSION_NAME = "5.60.0";
public static final String VERSION_NAME = "5.61.0";
}


Expand Down Expand Up @@ -91,5 +91,6 @@ private Constants() {






Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ public class LearningProvider extends Entity implements IJsonBackedObject {
@Nullable
public String displayName;

/**
* The Is Course Activity Sync Enabled.
* Indicates whether a provider can ingest learning course activity records. The default value is false. Set to true to make learningCourseActivities available for this provider.
*/
@SerializedName(value = "isCourseActivitySyncEnabled", alternate = {"IsCourseActivitySyncEnabled"})
@Expose
@Nullable
public Boolean isCourseActivitySyncEnabled;

/**
* The Login Web Url.
* Authentication URL to access the courses for the provider. Optional.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ public final AdditionalDataManager additionalDataManager() {
@Nullable
public Integer enabled;

/**
* The Locked Out.
*
*/
@SerializedName(value = "lockedOut", alternate = {"LockedOut"})
@Expose
@Nullable
public Integer lockedOut;

/**
* The Suspended.
* The number of units that are suspended because the subscription of the service SKU has been cancelled. The units cannot be assigned but can still be reactivated before they are deleted.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Error Information.
*
* If status is not success/ skipped details for the error are contained in this.
*/
@SerializedName(value = "errorInformation", alternate = {"ErrorInformation"})
@Expose
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/models/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public class User extends DirectoryObject implements IJsonBackedObject {

/**
* The Mobile Phone.
* The primary cellular telephone number for the user. Read-only for users synced from on-premises directory. Maximum length is 64 characters. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values).
* The primary cellular telephone number for the user. Read-only for users synced from on-premises directory. Maximum length is 64 characters. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values) and $search.
*/
@SerializedName(value = "mobilePhone", alternate = {"MobilePhone"})
@Expose
Expand Down

0 comments on commit 2ea4bc7

Please sign in to comment.