diff --git a/.github/workflows/all-js-update.yml b/.github/workflows/all-js-update.yml
deleted file mode 100644
index db7708214a..0000000000
--- a/.github/workflows/all-js-update.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: All NPM Update
-on:
- schedule:
- - cron: "0 8 * * *"
- workflow_dispatch:
-jobs:
- create-update-branch:
- name: "Create Update Branch"
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- with:
- ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
- fetch-depth: '25'
- - name: Setup Gradle
- uses: gradle/gradle-build-action@v2
- with:
- cache-read-only: true
- - name: Update All NPM Deps
- run: ./gradlew ncuUpgrade --no-configuration-cache --scan
- - name: Clean
- run: ./gradlew clean
- - name: Update Yarn Lock
- run: ./gradlew kotlinUpgradeYarnLock
- - name: Create Pull Request
- id: cpr
- uses: peter-evans/create-pull-request@v5
- with:
- branch: "create-pull-request/${{github.job}}/${{github.run_id}}"
- commit-message: "[create-pull-request] ${{github.workflow}}"
- token: ${{ secrets.GITHUB_TOKEN }}
- delete-branch: true
- - name: Enable Pull Request Automerge
- if: steps.cpr.outputs.pull-request-operation == 'created'
- uses: peter-evans/enable-pull-request-automerge@v2
- with:
- token: ${{ secrets.COUPLING_PAT }}
- pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
- merge-method: rebase
diff --git a/.github/workflows/gradle-plugin-update.yml b/.github/workflows/gradle-plugin-update.yml
deleted file mode 100644
index bc1aadd8fb..0000000000
--- a/.github/workflows/gradle-plugin-update.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Gradle Plugin Update
-on:
- schedule:
- - cron: "0 10 * * *"
- workflow_dispatch:
-jobs:
- create-update-branch:
- name: "Create Update Branch"
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- with:
- ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
- fetch-depth: '25'
- - name: Setup Gradle
- uses: gradle/gradle-build-action@v2
- with:
- cache-read-only: true
- - name: Update Plugin Deps
- run: ./gradlew :coupling-plugins:versionCatalogUpdate --no-configuration-cache --scan
- - name: Update Yarn Lock
- run: ./gradlew kotlinUpgradeYarnLock --scan
- - name: Create Pull Request
- id: cpr
- uses: peter-evans/create-pull-request@v5
- with:
- branch: "cpr-gradle-plugin-update/${{github.job}}/${{github.run_id}}"
- commit-message: "[create-pull-request] ${{github.workflow}}"
- token: ${{ secrets.GITHUB_TOKEN }}
- delete-branch: true
- - name: Enable Pull Request Automerge
- if: steps.cpr.outputs.pull-request-operation == 'created'
- uses: peter-evans/enable-pull-request-automerge@v2
- with:
- token: ${{ secrets.COUPLING_PAT }}
- pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
- merge-method: rebase
diff --git a/.github/workflows/gradle-update.yml b/.github/workflows/gradle-update.yml
index 4c165c914f..51aca326ba 100644
--- a/.github/workflows/gradle-update.yml
+++ b/.github/workflows/gradle-update.yml
@@ -17,9 +17,11 @@ jobs:
with:
cache-read-only: true
- name: Update Deps
- run: ./gradlew versionCatalogUpdate --no-configuration-cache --scan
+ run: ./gradlew versionCatalogUpdate --no-configuration-cache
+ - name: Clean
+ run: ./gradlew clean
- name: Update Yarn Lock
- run: ./gradlew kotlinUpgradeYarnLock --scan
+ run: ./gradlew kotlinUpgradeYarnLock --no-configuration-cache --no-build-cache
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 406d734b63..d21597f46d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -57,25 +57,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build.gradle.kts b/build.gradle.kts
index 49cde2de83..da9caad40e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,4 +46,9 @@ tasks {
)
isIgnoreExitValue = true
}
+
+ "versionCatalogUpdate" {
+ dependsOn("libraries:js-dependencies:ncuUpgrade")
+ dependsOn(provider { gradle.includedBuilds.map { it.task(":versionCatalogUpdate") } })
+ }
}