Update to Gradle 8.10.2
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
import org.gradle.internal.os.OperatingSystem
|
import org.gradle.internal.os.OperatingSystem
|
||||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
||||||
|
|
||||||
group = "org.openrndr.template"
|
group = "org.openrndr.template"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@@ -14,6 +15,7 @@ val orxFeatures = setOf<String>(
|
|||||||
"orx-camera",
|
"orx-camera",
|
||||||
// "orx-chataigne",
|
// "orx-chataigne",
|
||||||
"orx-color",
|
"orx-color",
|
||||||
|
// "orx-composition",
|
||||||
"orx-compositor",
|
"orx-compositor",
|
||||||
// "orx-compute-graph",
|
// "orx-compute-graph",
|
||||||
// "orx-compute-graph-nodes",
|
// "orx-compute-graph-nodes",
|
||||||
@@ -23,6 +25,8 @@ val orxFeatures = setOf<String>(
|
|||||||
// "orx-easing",
|
// "orx-easing",
|
||||||
"orx-envelopes",
|
"orx-envelopes",
|
||||||
// "orx-expression-evaluator",
|
// "orx-expression-evaluator",
|
||||||
|
// "orx-fcurve",
|
||||||
|
// "orx-fft",
|
||||||
// "orx-file-watcher",
|
// "orx-file-watcher",
|
||||||
"orx-fx",
|
"orx-fx",
|
||||||
// "orx-git-archiver",
|
// "orx-git-archiver",
|
||||||
@@ -58,9 +62,11 @@ val orxFeatures = setOf<String>(
|
|||||||
"orx-shade-styles",
|
"orx-shade-styles",
|
||||||
// "orx-shader-phrases",
|
// "orx-shader-phrases",
|
||||||
"orx-shapes",
|
"orx-shapes",
|
||||||
|
// "orx-svg",
|
||||||
// "orx-syphon",
|
// "orx-syphon",
|
||||||
// "orx-temporal-blur",
|
// "orx-temporal-blur",
|
||||||
// "orx-tensorflow",
|
// "orx-tensorflow",
|
||||||
|
// "orx-text-writer",
|
||||||
// "orx-time-operators",
|
// "orx-time-operators",
|
||||||
// "orx-timer",
|
// "orx-timer",
|
||||||
// "orx-triangulation",
|
// "orx-triangulation",
|
||||||
@@ -115,6 +121,17 @@ dependencies {
|
|||||||
// implementation(libs.gson)
|
// implementation(libs.gson)
|
||||||
// implementation(libs.csv)
|
// implementation(libs.csv)
|
||||||
|
|
||||||
|
/* ORSL dependencies */
|
||||||
|
|
||||||
|
// implementation(libs.orsl.shader.generator)
|
||||||
|
// implementation(libs.orsl.extension.color)
|
||||||
|
// implementation(libs.orsl.extension.easing)
|
||||||
|
// implementation(libs.orsl.extension.gradient)
|
||||||
|
// implementation(libs.orsl.extension.noise)
|
||||||
|
// implementation(libs.orsl.extension.pbr)
|
||||||
|
// implementation(libs.orsl.extension.raymarching)
|
||||||
|
// implementation(libs.orsl.extension.sdf)
|
||||||
|
|
||||||
implementation(libs.kotlinx.coroutines.core)
|
implementation(libs.kotlinx.coroutines.core)
|
||||||
implementation(libs.slf4j.api)
|
implementation(libs.slf4j.api)
|
||||||
implementation(libs.kotlin.logging)
|
implementation(libs.kotlin.logging)
|
||||||
@@ -140,11 +157,15 @@ dependencies {
|
|||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
|
kotlin {
|
||||||
|
compilerOptions {
|
||||||
|
languageVersion = KotlinVersion.KOTLIN_2_0
|
||||||
|
apiVersion = KotlinVersion.KOTLIN_2_0
|
||||||
|
jvmTarget = JvmTarget.JVM_17
|
||||||
}
|
}
|
||||||
tasks.withType<KotlinCompile> {
|
|
||||||
kotlinOptions.jvmTarget = "11"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
@@ -153,7 +174,7 @@ project.setProperty("mainClassName", applicationMainClass)
|
|||||||
|
|
||||||
application {
|
application {
|
||||||
if (hasProperty("openrndr.application")) {
|
if (hasProperty("openrndr.application")) {
|
||||||
mainClass.set("${property("openrndr.application")}")
|
mainClass = "${property("openrndr.application")}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,7 +213,7 @@ tasks {
|
|||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
tasks.register<Zip>("jpackageZip") {
|
tasks.register<Zip>("jpackageZip") {
|
||||||
archiveFileName.set("openrndr-application.zip")
|
archiveFileName = "openrndr-application.zip"
|
||||||
from("${layout.buildDirectory.get()}/jpackage") {
|
from("${layout.buildDirectory.get()}/jpackage") {
|
||||||
include("**/*")
|
include("**/*")
|
||||||
}
|
}
|
||||||
@@ -210,14 +231,14 @@ runtime {
|
|||||||
jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
|
jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
options.set(listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages"))
|
options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
|
||||||
modules.set(listOf("jdk.unsupported", "java.management", "java.desktop"))
|
modules = listOf("jdk.unsupported", "java.management", "java.desktop")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
tasks.register<org.openrndr.extra.gitarchiver.GitArchiveToMarkdown>("gitArchiveToMarkDown") {
|
tasks.register<org.openrndr.extra.gitarchiver.GitArchiveToMarkdown>("gitArchiveToMarkDown") {
|
||||||
historySize.set(20)
|
historySize = 20
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
@@ -287,7 +308,6 @@ class Openrndr {
|
|||||||
implementation(openrndr("openal"))
|
implementation(openrndr("openal"))
|
||||||
runtimeOnly(openrndrNatives("openal"))
|
runtimeOnly(openrndrNatives("openal"))
|
||||||
implementation(openrndr("application"))
|
implementation(openrndr("application"))
|
||||||
implementation(openrndr("svg"))
|
|
||||||
implementation(openrndr("animatable"))
|
implementation(openrndr("animatable"))
|
||||||
implementation(openrndr("extensions"))
|
implementation(openrndr("extensions"))
|
||||||
implementation(openrndr("filter"))
|
implementation(openrndr("filter"))
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
Reference in New Issue
Block a user