Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ jobs:
- name: Build and verify plugin
run: ./gradlew --stacktrace --warning-mode=all check buildPlugin -x traceRequirements

- name: OSSIndex audit
run: ./gradlew --stacktrace --warning-mode=all ossIndexAudit --info
env:
OSSINDEX_USERNAME: ${{ secrets.OSSINDEX_USERNAME }}
OSSINDEX_TOKEN: ${{ secrets.OSSINDEX_TOKEN }}

- name: Sonar analysis
if: ${{ env.SONAR_TOKEN != null }}
run: ./gradlew --stacktrace --warning-mode=all jacocoTestReport sonar -Dsonar.token=$SONAR_TOKEN
Expand Down
45 changes: 1 addition & 44 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
import org.gradle.api.Action
import org.gradle.api.Task
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.api.tasks.bundling.Zip
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
import org.itsallcode.openfasttrace.intellijplugin.build.OssIndexHttp429Failure
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
import org.sonatype.gradle.plugins.scan.ossindex.OssIndexAuditTask

// [bld->dsn~plugin-build-uses-intellij-platform-gradle-plugin~1]
// [bld->dsn~dependency-vulnerability-monitoring-uses-dependabot~1]
plugins {
id("java")
id("jacoco")
id("com.diffplug.spotless") version "8.4.0"
id("org.itsallcode.openfasttrace") version "3.1.1"
id("org.jetbrains.intellij.platform") version "2.15.0"
id("org.sonarqube") version "7.2.3.7755"
id("org.sonatype.gradle.plugins.scan") version "3.1.5"
}

group = providers.gradleProperty("group").get()
Expand All @@ -44,40 +40,6 @@ sonar {
}
}

val ossIndexUsername = providers.gradleProperty("ossIndexUsername")
.orElse(providers.environmentVariable("OSSINDEX_USERNAME"))
.orNull
val ossIndexToken = providers.gradleProperty("ossIndexToken")
.orElse(providers.environmentVariable("OSSINDEX_TOKEN"))
.orNull

fun Task.continueOnOssIndexHttp429() {
val auditActions = actions.toList()
val warningLogger = project.logger
actions = listOf(object : Action<Task> {
override fun execute(task: Task) {
try {
auditActions.forEach { it.execute(task) }
} catch (failure: RuntimeException) {
if (OssIndexHttp429Failure.matches(failure)) {
warningLogger.warn(OssIndexHttp429Failure.WARNING_MESSAGE)
} else {
throw failure
}
}
}
})
}

ossIndexAudit {
ossIndexUsername?.let { username = it }
ossIndexToken?.let { password = it }
isUseCache = true
isPrintBanner = false
isColorEnabled = false
isFailOnDetection = true
}

requirementTracing {
failBuild = true
inputDirectories = files("doc", "src/main/java", "src/test/java")
Expand Down Expand Up @@ -157,11 +119,6 @@ intellijPlatformTesting {
val instrumentedMainClasses = layout.buildDirectory.dir("instrumented/instrumentCode")

tasks {
named<OssIndexAuditTask>("ossIndexAudit") {
// [bld->dsn~oss-index-audit-continues-on-http-429~1]
continueOnOssIndexHttp429()
}

withType<JavaCompile>().configureEach {
options.release = 21
options.encoding = "UTF-8"
Expand Down
18 changes: 0 additions & 18 deletions buildSrc/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading