diff --git a/buildSrc/src/main/kotlin/DetektConfiguration.kt b/buildSrc/src/main/kotlin/DetektConfiguration.kt index d57b4b6776..d830c7299a 100644 --- a/buildSrc/src/main/kotlin/DetektConfiguration.kt +++ b/buildSrc/src/main/kotlin/DetektConfiguration.kt @@ -1,22 +1,24 @@ -import gradle.kotlin.dsl.accessors._466a692754d3da37fc853e1c7ad8ae1e.detekt -import gradle.kotlin.dsl.accessors._466a692754d3da37fc853e1c7ad8ae1e.detektPlugins import io.gitlab.arturbosch.detekt.Detekt import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask +import io.gitlab.arturbosch.detekt.extensions.DetektExtension import io.gitlab.arturbosch.detekt.report.ReportMergeTask import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.tasks.TaskProvider import org.gradle.kotlin.dsl.assign +import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.withType fun Project.configureDetekt() { val usesStrictTsRules = path in STRICT_TS_DETEKT_PROJECT_PATHS + val detektToolVersion = extensions.getByType().toolVersion dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${detekt.toolVersion}") + add("detektPlugins", "io.gitlab.arturbosch.detekt:detekt-formatting:$detektToolVersion") if (usesStrictTsRules) { - detektPlugins(project(USVM_DETEKT_RULES_PROJECT_PATH)) + add("detektPlugins", project(USVM_DETEKT_RULES_PROJECT_PATH)) } } @@ -44,7 +46,7 @@ fun Project.configureDetekt() { val reportFile = rootProject.layout.buildDirectory.file("reports/detekt/detekt.sarif") val configFiles = if (usesStrictTsRules) listOf(configFile, tsConfigFile) else listOf(configFile) - detekt { + extensions.configure { buildUponDefaultConfig = true ignoreFailures = !usesStrictTsRules parallel = true diff --git a/buildSrc/src/main/kotlin/usvmpython/tasks/JNIHeaderTask.kt b/buildSrc/src/main/kotlin/usvmpython/tasks/JNIHeaderTask.kt index 847d463911..751eec385b 100644 --- a/buildSrc/src/main/kotlin/usvmpython/tasks/JNIHeaderTask.kt +++ b/buildSrc/src/main/kotlin/usvmpython/tasks/JNIHeaderTask.kt @@ -1,9 +1,9 @@ package usvmpython.tasks -import gradle.kotlin.dsl.accessors._466a692754d3da37fc853e1c7ad8ae1e.main -import gradle.kotlin.dsl.accessors._466a692754d3da37fc853e1c7ad8ae1e.sourceSets import org.glavo.javah.JavahTask import org.gradle.api.Project +import org.gradle.api.tasks.SourceSetContainer +import org.gradle.kotlin.dsl.getByType import usvmpython.getGeneratedHeadersPath import usvmpython.CPYTHON_ADAPTER_CLASS @@ -11,7 +11,7 @@ import usvmpython.CPYTHON_ADAPTER_CLASS fun Project.generateJNIForCPythonAdapterTask() { val task = JavahTask() task.outputDir = getGeneratedHeadersPath().toPath() - val classpath = sourceSets.main.get().runtimeClasspath + val classpath = extensions.getByType().getByName("main").runtimeClasspath classpath.files.forEach { task.addClassPath(it.toPath()) } diff --git a/buildSrc/src/main/kotlin/usvmpython/tasks/PythonSamplesTasks.kt b/buildSrc/src/main/kotlin/usvmpython/tasks/PythonSamplesTasks.kt index a486687aec..5d1db2ebba 100644 --- a/buildSrc/src/main/kotlin/usvmpython/tasks/PythonSamplesTasks.kt +++ b/buildSrc/src/main/kotlin/usvmpython/tasks/PythonSamplesTasks.kt @@ -1,12 +1,12 @@ package usvmpython.tasks -import gradle.kotlin.dsl.accessors._466a692754d3da37fc853e1c7ad8ae1e.sourceSets -import gradle.kotlin.dsl.accessors._466a692754d3da37fc853e1c7ad8ae1e.test import org.gradle.api.Project import org.gradle.api.tasks.Exec import org.gradle.api.tasks.JavaExec +import org.gradle.api.tasks.SourceSetContainer import org.gradle.api.tasks.TaskProvider import org.gradle.kotlin.dsl.environment +import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.register import usvmpython.* import java.io.File @@ -45,7 +45,7 @@ fun Project.registerBuildSamplesTask(): TaskProvider { dependsOn(installMypyRunner) inputs.files(fileTree(samplesSourceDir).exclude("**/__pycache__/**")) outputs.dir(samplesBuildDir) - classpath = sourceSets.test.get().runtimeClasspath + classpath = extensions.getByType().getByName("test").runtimeClasspath args = listOf(samplesSourceDir.canonicalPath, samplesBuildDir.canonicalPath, pythonBinaryPath) environment("LD_LIBRARY_PATH" to "$cpythonBuildPath/lib:$cpythonAdapterBuildPath") environment("PYTHONHOME" to cpythonBuildPath) diff --git a/jitpack.yml b/jitpack.yml index 88cfba7a93..a6b0c23535 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1 +1,3 @@ jdk: openjdk11 +install: + - ./gradlew clean -Pgroup=com.github.UnitTestBot -Pversion=$VERSION -xtest publishToMavenLocal