diff options
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | build.gradle.kts | 39 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | src/main/resources/log4j2.yaml | 25 |
4 files changed, 32 insertions, 36 deletions
@@ -2,4 +2,4 @@ application.log build out .idea -.gradle +.gradle
\ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 9711c45..b728a36 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,11 +36,12 @@ val orxFeatures = setOf( // "orx-poisson-fill", // "orx-runway", // "orx-shader-phrases", - "orx-shade-styles" + "orx-shade-styles", // "orx-shapes", // "orx-syphon", // "orx-temporal-blur", -// "orx-kinect-v1" +// "orx-kinect-v1", + "orx-panel" ) /* Which OPENRNDR libraries should be added to this project? */ @@ -51,13 +52,10 @@ val openrndrFeatures = setOf( /* Which version of OPENRNDR, ORX and Panel should be used? */ val openrndrUseSnapshot = false -val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.39" - -val panelUseSnapshot = false -val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.21" +val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.40" val orxUseSnapshot = false -val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.49" +val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.50" //<editor-fold desc="This is code for OPENRNDR, no need to edit this .. most of the times"> val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64") @@ -88,18 +86,18 @@ enum class Logging { } /* What type of logging should this project use? */ -val applicationLogging = Logging.SIMPLE +val applicationLogging = Logging.FULL -val kotlinVersion = "1.3.61" +val kotlinVersion = "1.3.71" plugins { java - kotlin("jvm") version("1.3.61") + kotlin("jvm") version("1.3.71") } repositories { mavenCentral() - if (openrndrUseSnapshot || orxUseSnapshot || panelUseSnapshot) { + if (openrndrUseSnapshot || orxUseSnapshot) { mavenLocal() } maven(url = "https://dl.bintray.com/openrndr/openrndr") @@ -139,20 +137,20 @@ dependencies { implementation(openrndr("extensions")) implementation(openrndr("filter")) - implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.3") - implementation("io.github.microutils", "kotlin-logging","1.7.8") + implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.5") + implementation("io.github.microutils", "kotlin-logging","1.7.9") when(applicationLogging) { Logging.NONE -> { - runtimeOnly("org.slf4j","slf4j-nop","1.7.29") + runtimeOnly("org.slf4j","slf4j-nop","1.7.30") } Logging.SIMPLE -> { - runtimeOnly("org.slf4j","slf4j-simple","1.7.29") + runtimeOnly("org.slf4j","slf4j-simple","1.7.30") } Logging.FULL -> { - runtimeOnly("org.apache.logging.log4j", "log4j-slf4j-impl", "2.13.0") - runtimeOnly("com.fasterxml.jackson.core", "jackson-databind", "2.10.1") - runtimeOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.10.1") + runtimeOnly("org.apache.logging.log4j", "log4j-slf4j-impl", "2.13.1") + runtimeOnly("com.fasterxml.jackson.core", "jackson-databind", "2.10.3") + runtimeOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.10.3") } } @@ -161,10 +159,6 @@ dependencies { runtimeOnly(openrndrNatives("ffmpeg")) } - if ("panel" in openrndrFeatures) { - implementation("org.openrndr.panel:openrndr-panel:$panelVersion") - } - for (feature in orxFeatures) { implementation(orx(feature)) } @@ -192,6 +186,7 @@ tasks.withType<KotlinCompile> { } tasks.withType<Jar> { + isZip64 = true manifest { attributes["Main-Class"] = applicationMainClass } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 31a47a5..9f22df5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Thu Aug 01 12:32:31 CEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/src/main/resources/log4j2.yaml b/src/main/resources/log4j2.yaml index cdef115..021e84d 100644 --- a/src/main/resources/log4j2.yaml +++ b/src/main/resources/log4j2.yaml @@ -1,20 +1,21 @@ Configuration: status: warn Appenders: - Console: - name: Console - target: SYSTEM_OUT + Console: + - name: Console_Info + target: SYSTEM_ERR PatternLayout: - Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" - File: - append: false - name: File_Appender - fileName: application.log - PatternLayout: - Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" + Pattern: "%highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=green} %style{[%t]}{white} %style{%-30.30c{1.}}{white} %style{ ↘ %m%n%ex}{white}" + #Pattern: "%style{%d{yyyy-MM-dd HH:mm:ss.SSS}}{white} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=green} %style{[%t]}{white} %style{%-30.30c{1.}}{cyan} %style{:%m%n%ex}{white}" + File: + append: false + name: File_Appender + fileName: application.log + PatternLayout: + Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" Loggers: Root: - level: debug + level: info AppenderRef: - - ref: Console + - ref: Console_Info - ref: File_Appender
\ No newline at end of file |