kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use rich version range for openrndr (#293)

Browse Source
This commit is contained in:
Vechro
2023-03-04 14:58:45 +02:00
committed by GitHub
parent 8af6b764e0
commit 4d0a41ab0b
11 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
buildSrc/build.gradle.kts
View File

@@ -9,16 +9,6 @@ repositories {
mavenLocal()
}
val openrndrVersion: String =
(extra.properties["OPENRNDR.version"] as String? ?: System.getenv("OPENRNDR_VERSION"))?.removePrefix("v")
?: "0.5.1-SNAPSHOT"
configurations.all {
resolutionStrategy.eachDependency {
if (requested.group == "org.openrndr") useVersion(openrndrVersion)
}
}
dependencies {
implementation(libs.kotlin.gradle.plugin)
implementation(libs.dokka.gradle.plugin)

10
buildSrc/src/main/kotlin/org/openrndr/extra/convention/component-metadata-rule.gradle.kts
View File

@@ -2,16 +2,6 @@ package org.openrndr.extra.convention
addHostMachineAttributesToRuntimeConfigurations()
val openrndrVersion: String =
(extra.properties["OPENRNDR.version"] as String? ?: System.getenv("OPENRNDR_VERSION"))?.removePrefix("v")
?: "0.5.1-SNAPSHOT"
configurations.all {
resolutionStrategy.eachDependency {
if (requested.group == "org.openrndr") useVersion(openrndrVersion)
}
}
dependencies {
components {
all<LwjglRule>()

5
buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts
View File

@@ -3,7 +3,6 @@ package org.openrndr.extra.convention
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URI
val libs = the<LibrariesForLibs>()
@@ -22,10 +21,10 @@ repositories {
group = "org.openrndr.extra"
val main by sourceSets.getting
val main: SourceSet by sourceSets.getting
@Suppress("UNUSED_VARIABLE")
val demo by sourceSets.creating
val demo: SourceSet by sourceSets.creating
dependencies {
implementation(libs.kotlin.stdlib)

6
buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts
View File

@@ -4,7 +4,6 @@ import CollectScreenshotsTask
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URI
val libs = the<LibrariesForLibs>()
@@ -31,7 +30,8 @@ kotlin {
jvm {
jvmToolchain(libs.versions.jvmTarget.get().toInt())
compilations {
val main by getting
val main by getting
@Suppress("UNUSED_VARIABLE")
val demo by creating {
associateWith(main)
@@ -39,7 +39,7 @@ kotlin {
inputDir.set(output.classesDirs.singleFile)
runtimeDependencies.set(runtimeDependencyFiles)
outputDir.set(project.file(project.projectDir.toString() + "/images"))
dependsOn(compileKotlinTask)
dependsOn(compileTaskProvider)
}
}
}