Skip to content

handles merge conflicts for release #1780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
baywet merged 176 commits into from
Feb 7, 2024
Merged

handles merge conflicts for release #1780

baywet merged 176 commits into from
Feb 7, 2024

Conversation

@baywet
Copy link
Member

@baywet baywet commented Feb 7, 2024

  • Update generated files with build 122943
  • Update CHANGELOG.md
  • Bump com.android.tools.build:gradle from 8.1.0 to 8.1.1 in /android
  • Update generated files with build 123864
  • Bump tibdex/github-app-token from 1.8.0 to 1.8.2
  • Update CHANGELOG.md
  • Bump actions/checkout from 3 to 4
  • Bump rickstaa/action-create-tag from 1.6.2 to 1.6.3
  • Update generated files with build 124351
  • chore: update branch protection rules (chore: update branch protection rules #1544)
  • Bump com.github.ben-manes:gradle-versions-plugin in /android
  • Update CHANGELOG.md
  • Bump tibdex/github-app-token from 1.8.2 to 2.0.0
  • Bump com.gradle:gradle-enterprise-gradle-plugin in /android
  • Bump dawidd6/action-download-artifact from 2.27.0 to 2.28.0
  • Update generated files with build 125212
  • Bump tibdex/github-app-token from 2.0.0 to 2.1.0
  • Update CHANGELOG.md
  • Bump android-actions/setup-android from 2.0.10 to 3.0.0
  • Update generated files with build 125718
  • Bump com.android.tools.build:gradle from 8.1.1 to 8.1.2 in /android
  • Update CHANGELOG.md
  • Update generated files with build 126033
  • Bump com.gradle:gradle-enterprise-gradle-plugin in /android
  • Update CHANGELOG.md
  • Bump com.github.ben-manes:gradle-versions-plugin in /android
  • Update generated files with build 126471
  • Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
  • Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
  • Update CHANGELOG.md
  • Bump rickstaa/action-create-tag from 1.6.3 to 1.6.4
  • Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
  • Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 in /android
  • Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
  • Update generated files with build 127164
  • Update CHANGELOG.md
  • Bump com.microsoft.graph:microsoft-graph-core from 2.0.19 to 2.0.20
  • Bump com.microsoft.graph:microsoft-graph-core from 2.0.19 to 2.0.20
  • Bump rickstaa/action-create-tag from 1.6.4 to 1.6.6
  • Bump org.junit.jupiter:junit-jupiter-api from 5.10.0 to 5.10.1
  • Bump org.junit.jupiter:junit-jupiter-api from 5.10.0 to 5.10.1
  • Bump org.junit.jupiter:junit-jupiter-api in /android
  • Bump org.junit.jupiter:junit-jupiter-engine from 5.10.0 to 5.10.1
  • Update generated files with build 128432
  • Bump com.android.tools.build:gradle from 8.1.2 to 8.1.3 in /android
  • Bump com.microsoft.graph:microsoft-graph-core from 2.0.20 to 2.0.21
  • Bump rickstaa/action-create-tag from 1.6.6 to 1.7.1
  • Bump com.microsoft.graph:microsoft-graph-core in /android
  • Update CHANGELOG.md
  • Update generated files with build 128844
  • Bump com.android.tools.build:gradle from 8.1.3 to 8.1.4 in /android
  • Update CHANGELOG.md
  • Bump com.github.ben-manes:gradle-versions-plugin in /android
  • Bump android-actions/setup-android from 3.0.0 to 3.1.0
  • Bump android-actions/setup-android from 3.1.0 to 3.2.0
  • Bump actions/setup-java from 3 to 4
  • Bump com.android.tools.build:gradle from 8.1.4 to 8.2.0 in /android
    • upgrades to gradle wrapper 8.5
    • adds dependabot configuration for v6
  • Bump com.gradle:gradle-enterprise-gradle-plugin in /android
    • adds groups configuration
  • Bump rickstaa/action-create-tag from 1.7.1 to 1.7.2
  • Update generated files with build 130446
  • Bump dawidd6/action-download-artifact from 2.28.0 to 2.28.1
  • Bump github/codeql-action from 2 to 3
  • Bump dawidd6/action-download-artifact from 2.28.1 to 3.0.0
  • Update CHANGELOG.md
  • Bump actions/download-artifact from 3 to 4
  • Bump actions/upload-artifact from 3 to 4
  • Bump com.gradle:gradle-enterprise-gradle-plugin in /android
  • Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
  • Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre in /android
  • Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
  • Update generated files with build 130669
  • Update CHANGELOG.md
  • Bump com.android.tools.build:gradle from 8.2.0 to 8.2.1 in /android
  • Bump anton-yurchenko/git-release from 5.0 to 6.0
  • Create upgrade-to-v6.md
  • code review
  • clean up table of contents
  • Bump com.github.ben-manes:gradle-versions-plugin in /android
  • Update generated files with build 132033
  • Update CHANGELOG.md
  • Update build.gradle
  • Bump com.gradle:gradle-enterprise-gradle-plugin in /android
  • Bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2
  • Bump org.junit.jupiter:junit-jupiter-engine in /android
  • Bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2
  • Bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2

Microsoft Graph DevX Tooling and others added 30 commits August 15, 2023 10:10
Update generated files with build 122943
507f55d
@ramsessanchez
Update CHANGELOG.md
bb81134
@ramsessanchez
Merge pull request #1531 from microsoftgraph/v1.0/pipelinebuild/122943
3759e42 
Generated  models and request builders
@dependabot
Bump com.android.tools.build:gradle from 8.1.0 to 8.1.1 in /android
0c889be 
Bumps com.android.tools.build:gradle from 8.1.0 to 8.1.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1537 from microsoftgraph/dependabot/gradle/androi…
14c81dc 
…d/com.android.tools.build-gradle-8.1.1

Bump com.android.tools.build:gradle from 8.1.0 to 8.1.1 in /android
Update generated files with build 123864
4de36f5
@dependabot
Bump tibdex/github-app-token from 1.8.0 to 1.8.2
31f729d 
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.8.0 to 1.8.2.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](tibdex/github-app-token@b625283...0d49dd7)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1545 from microsoftgraph/dependabot/github_action…
e856374 
…s/tibdex/github-app-token-1.8.2

Bump tibdex/github-app-token from 1.8.0 to 1.8.2
@ramsessanchez
Update CHANGELOG.md
fb78a10
@ramsessanchez
Merge pull request #1541 from microsoftgraph/v1.0/pipelinebuild/123864
c603503 
Generated  models and request builders
@dependabot
Bump actions/checkout from 3 to 4
5f84cff 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump rickstaa/action-create-tag from 1.6.2 to 1.6.3
c967018 
Bumps [rickstaa/action-create-tag](https://github.com/rickstaa/action-create-tag) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/rickstaa/action-create-tag/releases)
- [Commits](rickstaa/action-create-tag@v1.6.2...v1.6.3)

---
updated-dependencies:
- dependency-name: rickstaa/action-create-tag
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1547 from microsoftgraph/dependabot/github_action…
3508bd5 
…s/rickstaa/action-create-tag-1.6.3

Bump rickstaa/action-create-tag from 1.6.2 to 1.6.3
@andrueastman
Merge pull request #1546 from microsoftgraph/dependabot/github_action…
e4bb461 
…s/actions/checkout-4

Bump actions/checkout from 3 to 4
Update generated files with build 124351
6ba5455
@MIchaelMainer
chore: update branch protection rules (#1544)
6dce36f
@dependabot
Bump com.github.ben-manes:gradle-versions-plugin in /android
f5840e3 
Bumps [com.github.ben-manes:gradle-versions-plugin](https://github.com/ben-manes/gradle-versions-plugin) from 0.47.0 to 0.48.0.
- [Release notes](https://github.com/ben-manes/gradle-versions-plugin/releases)
- [Commits](ben-manes/gradle-versions-plugin@v0.47.0...v0.48.0)

---
updated-dependencies:
- dependency-name: com.github.ben-manes:gradle-versions-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@baywet
Merge pull request #1550 from microsoftgraph/dependabot/gradle/androi…
68f882e 
…d/com.github.ben-manes-gradle-versions-plugin-0.48.0

Bump com.github.ben-manes:gradle-versions-plugin from 0.47.0 to 0.48.0 in /android
@ramsessanchez
Update CHANGELOG.md
3c73b8b
@ramsessanchez
Merge branch 'dev' into v1.0/pipelinebuild/124351
bdb26bb
@ramsessanchez
Merge pull request #1548 from microsoftgraph/v1.0/pipelinebuild/124351
8d97d1f 
Generated  models and request builders
@dependabot
Bump tibdex/github-app-token from 1.8.2 to 2.0.0
a30161c 
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.8.2 to 2.0.0.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](tibdex/github-app-token@0d49dd7...0914d50)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1552 from microsoftgraph/dependabot/github_action…
84fdee1 
…s/tibdex/github-app-token-2.0.0

Bump tibdex/github-app-token from 1.8.2 to 2.0.0
@dependabot
Bump com.gradle:gradle-enterprise-gradle-plugin in /android
fab5333 
Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.14.1 to 3.15.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1556 from microsoftgraph/dependabot/gradle/androi…
f23a5d5 
…d/com.gradle-gradle-enterprise-gradle-plugin-3.15

Bump com.gradle:gradle-enterprise-gradle-plugin from 3.14.1 to 3.15 in /android
@dependabot
Bump dawidd6/action-download-artifact from 2.27.0 to 2.28.0
6f6f245 
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2.27.0 to 2.28.0.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](dawidd6/action-download-artifact@v2.27.0...v2.28.0)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1557 from microsoftgraph/dependabot/github_action…
4121942 
…s/dawidd6/action-download-artifact-2.28.0

Bump dawidd6/action-download-artifact from 2.27.0 to 2.28.0
Update generated files with build 125212
c6f6505
@dependabot
Bump tibdex/github-app-token from 2.0.0 to 2.1.0
9060d19 
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](tibdex/github-app-token@0914d50...3beb63f)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1559 from microsoftgraph/dependabot/github_action…
0e60b5e 
…s/tibdex/github-app-token-2.1.0

Bump tibdex/github-app-token from 2.0.0 to 2.1.0
ramsessanchez and others added 13 commits January 23, 2024 11:03
@ramsessanchez
Update build.gradle
7957265
@ramsessanchez
Merge pull request #1752 from microsoftgraph/v1.0/pipelinebuild/132033
3fd276e 
Generated  models and request builders
@dependabot
Bump com.gradle:gradle-enterprise-gradle-plugin in /android
8de1434 
Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.16.1 to 3.16.2.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1758 from microsoftgraph/dependabot/gradle/androi…
d65d669 
…d/com.gradle-gradle-enterprise-gradle-plugin-3.16.2

Bump com.gradle:gradle-enterprise-gradle-plugin from 3.16.1 to 3.16.2 in /android
@dependabot
Bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2
3ee6c1b 
Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump org.junit.jupiter:junit-jupiter-engine in /android
10e3ece 
Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1767 from microsoftgraph/dependabot/gradle/org.ju…
9590d9a 
…nit.jupiter-junit-jupiter-engine-5.10.2

Bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2
@andrueastman
Merge pull request #1769 from microsoftgraph/dependabot/gradle/androi…
39e63d7 
…d/org.junit.jupiter-junit-jupiter-engine-5.10.2

Bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2 in /android
@dependabot
Bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2
2715f0c 
Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1771 from microsoftgraph/dependabot/maven/org.jun…
476d562 
…it.jupiter-junit-jupiter-api-5.10.2

Bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2
@dependabot
Bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2
1b72cc4 
Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit-framework@r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@andrueastman
Merge pull request #1768 from microsoftgraph/dependabot/gradle/org.ju…
f19ac2d 
…nit.jupiter-junit-jupiter-api-5.10.2

Bump org.junit.jupiter:junit-jupiter-api from 5.10.1 to 5.10.2
@baywet
Merge branch 'feature/6.0' into release/v6
4d9470b
@baywet baywet requested a review from a team as a code owner February 7, 2024 20:57
@baywet baywet self-assigned this Feb 7, 2024
@baywet baywet enabled auto-merge February 7, 2024 20:57
@baywet baywet disabled auto-merge February 7, 2024 20:58
@baywet baywet mentioned this pull request Feb 7, 2024
Closed
ramsessanchez
ramsessanchez previously approved these changes Feb 7, 2024
View reviewed changes
@ramsessanchez ramsessanchez self-requested a review February 7, 2024 21:43
@baywet baywet enabled auto-merge February 7, 2024 22:02
@baywet baywet merged commit be93e35 into feature/6.0 Feb 7, 2024
@baywet baywet deleted the release/v6 branch February 7, 2024 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ramsessanchez ramsessanchez ramsessanchez approved these changes

Assignees

@baywet baywet

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@baywet @ramsessanchez @andrueastman @MIchaelMainer