Skip to content

Commit bdb26bb

Browse files
Merge branch 'dev' into v1.0/pipelinebuild/124351
2 parents 3c73b8b + 68f882e commit bdb26bb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/policies/msgraph-sdk-java-branch-protection.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ configuration:
3030
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
3131
requiresCommitSignatures: false
3232
# Are conversations required to be resolved before merging? boolean
33-
requiresConversationResolution: false
33+
requiresConversationResolution: true
3434
# Are merge commits prohibited from being pushed to this branch. boolean
3535
requiresLinearHistory: false
3636
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
3737
requiredStatusChecks:
38-
- CodeQL
38+
- Analyze (java)
3939
- lint-api-level
4040
- license/cla
4141
- build
4242
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
43-
requiresStrictStatusChecks: false
43+
requiresStrictStatusChecks: true
4444
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
4545
restrictsPushes: false
4646
# Restrict who can dismiss pull request reviews. boolean
@@ -67,17 +67,17 @@ configuration:
6767
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
6868
requiresCommitSignatures: false
6969
# Are conversations required to be resolved before merging? boolean
70-
requiresConversationResolution: false
70+
requiresConversationResolution: true
7171
# Are merge commits prohibited from being pushed to this branch. boolean
7272
requiresLinearHistory: false
7373
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
7474
requiredStatusChecks:
75-
- CodeQL
75+
- Analyze (java)
7676
- lint-api-level
7777
- license/cla
7878
- build
7979
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
80-
requiresStrictStatusChecks: false
80+
requiresStrictStatusChecks: true
8181
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
8282
restrictsPushes: false
8383
# Restrict who can dismiss pull request reviews. boolean

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
dependencies {
1111
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.14.1"
1212
classpath "com.android.tools.build:gradle:8.1.1"
13-
classpath "com.github.ben-manes:gradle-versions-plugin:0.47.0"
13+
classpath "com.github.ben-manes:gradle-versions-plugin:0.48.0"
1414
}
1515
}
1616

0 commit comments

Comments
 (0)