diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0426066..fb4b039 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,6 +34,9 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + - name: Execute buildHealth for build-logic + run: './gradlew -p build-logic buildHealth -s' + - name: Execute check run: './gradlew check -s' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a770499..9587cb7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -56,10 +56,13 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + - name: Execute buildHealth for build-logic + run: './gradlew -p build-logic buildHealth -s' + - name: Execute check run: './gradlew check -s' - - name: Execute buildHealth + - name: Execute buildHealth for main project run: './gradlew buildHealth -s' - name: Publish artifacts @@ -88,4 +91,4 @@ jobs: kotlin-format/build/libs/kotlin-formatter-${{ needs.release_version.outputs.version }}-all.jar kotlin-format/build/distributions/kotlin-formatter-dist-${{ needs.release_version.outputs.version }}.zip env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 6f6af03..015b6c9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -38,8 +38,11 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + - name: Execute buildHealth for build-logic + run: './gradlew -p build-logic buildHealth -s' + - name: Execute check run: './gradlew check -s' - - name: Execute buildHealth + - name: Execute buildHealth for main project run: './gradlew buildHealth -s' diff --git a/build-logic/conventions/build.gradle.kts b/build-logic/conventions/build.gradle.kts index 46d419a..08f0c9c 100644 --- a/build-logic/conventions/build.gradle.kts +++ b/build-logic/conventions/build.gradle.kts @@ -20,9 +20,7 @@ kotlin { } dependencies { - implementation(libs.dependencyAnalysisPlugin) implementation(libs.develocityPlugin) - implementation(libs.kotlinGradlePlugin) } val javaTarget = JavaLanguageVersion.of(libs.versions.java.get()) diff --git a/build.gradle.kts b/build.gradle.kts index 6d67535..cd90f8c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { - id("com.autonomousapps.dependency-analysis") + alias(libs.plugins.kotlin) apply false + alias(libs.plugins.dependencyAnalysis) } // https://github.com/autonomousapps/dependency-analysis-gradle-plugin/wiki diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5025d9f..e8a4f43 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,6 @@ junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "juni junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiter" } junitLauncher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatform" } junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junitJupiter" } -kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } ktfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" } mordant = { module = "com.github.ajalt.mordant:mordant", version.ref = "mordant" }