Skip to content

Commit 5f1ce30

Browse files
committed
Merge branch 'refs/heads/main' into update/bcv-0.15.0
# Conflicts: # buildSrc/src/main/kotlin/buildsrc/utils/gradle.kt # buildSrc/src/main/kotlin/buildsrc/utils/intellij.kt # gradle.properties # gradle/libs.versions.toml
2 parents 4d21585 + c9a0e93 commit 5f1ce30

File tree

6 files changed

+15
-571
lines changed

6 files changed

+15
-571
lines changed

.github/renovate.json5

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@
3131
],
3232

3333
timezone: "Etc/UTC",
34+
// loosely limit to Europe work hours, so we don't get pinged in the middle of the night
3435
schedule: [
35-
//"on the first day of the month",
36-
"after 10am",
36+
"after 10am and before 6pm",
37+
],
38+
automergeSchedule: [
39+
"after 10am and before 6pm",
3740
],
3841

3942
stabilityDays: 14,

.github/workflows/run_gradle_task.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
ref: ${{ inputs.checkout-ref || github.ref }}
6262

6363
- name: Validate Gradle Wrapper
64-
uses: gradle/wrapper-validation-action@v1
64+
uses: gradle/wrapper-validation-action@v2
6565

6666
- name: Setup JDK 11
6767
uses: actions/setup-java@v4
@@ -78,7 +78,7 @@ jobs:
7878
- name: Setup Android SDK # required for integration tests
7979
uses: android-actions/setup-android@v3
8080

81-
- uses: gradle/gradle-build-action@v2
81+
- uses: gradle/gradle-build-action@v3
8282
with:
8383
gradle-home-cache-cleanup: true
8484
arguments: ${{ inputs.gradle-task }}
@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Upload build reports
9393
if: failure()
94-
uses: actions/upload-artifact@v3
94+
uses: actions/upload-artifact@v4
9595
with:
9696
name: build-report-${{ runner.os }}${{ github.action }}
9797
path: |

buildSrc/src/main/kotlin/buildsrc/utils/gradle.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ internal fun Configuration.declarable(
5151
* ```
5252
*/
5353
internal fun Configuration.consumable(
54-
visible: Boolean = true,
54+
visible: Boolean = false,
5555
) {
5656
isCanBeResolved = false
5757
isCanBeConsumed = true

0 commit comments

Comments
 (0)