Skip to content

Fix JitPack builds and Gradle-version-dependent buildSrc imports #634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Saloed merged 1 commit into from
Nov 1, 2026
Merged

Fix JitPack builds and Gradle-version-dependent buildSrc imports #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions buildSrc/src/main/kotlin/DetektConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<DetektExtension>().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))
}
}

Expand Down Expand Up @@ -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<DetektExtension> {
buildUponDefaultConfig = true
ignoreFailures = !usesStrictTsRules
parallel = true
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/usvmpython/tasks/JNIHeaderTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
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


fun Project.generateJNIForCPythonAdapterTask() {
val task = JavahTask()
task.outputDir = getGeneratedHeadersPath().toPath()
val classpath = sourceSets.main.get().runtimeClasspath
val classpath = extensions.getByType<SourceSetContainer>().getByName("main").runtimeClasspath
classpath.files.forEach {
task.addClassPath(it.toPath())
}
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/usvmpython/tasks/PythonSamplesTasks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -45,7 +45,7 @@ fun Project.registerBuildSamplesTask(): TaskProvider<JavaExec> {
dependsOn(installMypyRunner)
inputs.files(fileTree(samplesSourceDir).exclude("**/__pycache__/**"))
outputs.dir(samplesBuildDir)
classpath = sourceSets.test.get().runtimeClasspath
classpath = extensions.getByType<SourceSetContainer>().getByName("test").runtimeClasspath
args = listOf(samplesSourceDir.canonicalPath, samplesBuildDir.canonicalPath, pythonBinaryPath)
environment("LD_LIBRARY_PATH" to "$cpythonBuildPath/lib:$cpythonAdapterBuildPath")
environment("PYTHONHOME" to cpythonBuildPath)
Expand Down
2 changes: 2 additions & 0 deletions jitpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
jdk: openjdk11
install:
- ./gradlew clean -Pgroup=com.github.UnitTestBot -Pversion=$VERSION -xtest publishToMavenLocal