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

Update jarchivelib, add task to list all dependencies, target JVM 11 (#256)

Browse Source
This commit is contained in:
Vechro
2022-08-10 23:58:38 +03:00
committed by GitHub
parent 09cb062154
commit bc7d14c347
21 changed files with 53 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
build.gradle
View File

@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
// root build.gradle
buildscript {
repositories {
@@ -12,28 +14,28 @@ buildscript {
plugins {
// remember to update all the versions here when upgrading kotlin version
id 'org.jetbrains.kotlin.jvm' apply false
id 'org.jetbrains.kotlin.multiplatform' apply false
id 'org.jetbrains.kotlin.multiplatform' apply false
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
}
def multiplatformModules = [
"orx-camera",
"orx-color",
"orx-compositor",
"orx-compute-graph",
"orx-compute-graph-nodes",
"orx-easing",
"orx-fx",
"orx-gradient-descent",
"orx-image-fit",
"orx-no-clear",
"orx-noise",
"orx-parameters",
"orx-shade-styles",
"orx-shader-phrases",
"orx-shapes",
"orx-quadtree",
"orx-hash-grid"
"orx-camera",
"orx-color",
"orx-compositor",
"orx-compute-graph",
"orx-compute-graph-nodes",
"orx-easing",
"orx-fx",
"orx-gradient-descent",
"orx-image-fit",
"orx-no-clear",
"orx-noise",
"orx-parameters",
"orx-shade-styles",
"orx-shader-phrases",
"orx-shapes",
"orx-quadtree",
"orx-hash-grid"
]
@@ -181,15 +183,15 @@ configure(allprojects.findAll { !doNotPublish.contains(it.name) && (multiplatfor
licenses {
license {
name = 'BSD-2-Clause'
url = 'https://github.com/openrndr/openrndr/blob/master/LICENSE'
url = 'https://github.com/openrndr/orx/blob/master/LICENSE'
distribution = 'repo'
}
}
}
scm {
connection = "scm:git:git@github.com:openrndr/openrndr.git"
developerConnection = "scm:git:ssh://github.com/openrndr/openrndr.git"
url = "https://github.com/openrndr/openrndr"
connection = "scm:git:git@github.com:openrndr/orx.git"
developerConnection = "scm:git:ssh://github.com/openrndr/orx.git"
url = "https://github.com/openrndr/orx"
}
}
}
@@ -305,11 +307,6 @@ configure(allprojects.findAll { !doNotPublish.contains(it.name) && !multiplatfor
}
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
javadoc {
options.addBooleanOption 'Xdoclint:none', true
}
@@ -323,7 +320,7 @@ group = "org.openrndr"
nexusPublishing {
repositories {
sonatype {
username.set( findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME"))
username.set(findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME"))
password.set(findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD"))
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots"))
@@ -331,7 +328,24 @@ nexusPublishing {
}
}
subprojects {
// Equivalent Kotlin is: tasks.register<DependencyReportTask>("dependenciesAll") { ...
tasks.register("dependenciesAll", DependencyReportTask) {
group = "help"
description = "Displays all dependencies, including subprojects."
}
kotlin {
// https://youtrack.jetbrains.com/issue/KT-43095/Add-support-for-Java-Toolchain-to-the-Gradle-plugin#focus=Comments-27-5192573.0-0
jvmToolchain { toolchain ->
(toolchain as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get()))
}
tasks.withType(KotlinCompile).configureEach {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
}
}
//configure(allprojects.findAll { it.name != "openrndr-demos" }) {

9
gradle.properties
View File

@@ -1 +1,8 @@
org.gradle.parallel=true
# suppress inspection "UnusedProperty" for whole file
org.gradle.parallel=true
# Enable compatibility with non-hierarchical projects
# https://kotlinlang.org/docs/multiplatform-hierarchy.html#for-library-authors
kotlin.mpp.enableCompatibilityMetadataVariant=true
# https://kotlinlang.org/docs/gradle.html#check-for-jvm-target-compatibility-of-related-compile-tasks
kotlin.jvm.target.validation.mode=error

4
orx-camera/build.gradle.kts
View File

@@ -24,10 +24,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-color/build.gradle.kts
View File

@@ -26,10 +26,6 @@ kotlin {
collectScreenshots { }
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-compositor/build.gradle.kts
View File

@@ -25,10 +25,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-compute-graph-nodes/build.gradle.kts
View File

@@ -23,10 +23,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

6
orx-compute-graph/build.gradle.kts
View File

@@ -1,5 +1,3 @@
import EmbedShadersTask
plugins {
kotlin("multiplatform")
kotlin("plugin.serialization")
@@ -22,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-easing/build.gradle.kts
View File

@@ -25,10 +25,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-fx/build.gradle.kts
View File

@@ -34,10 +34,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-gradient-descent/build.gradle.kts
View File

@@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-hash-grid/build.gradle.kts
View File

@@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-image-fit/build.gradle.kts
View File

@@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

15
orx-jvm/orx-tensorflow/build.gradle
View File

@@ -1,7 +1,3 @@
java {
sourceCompatibility = libs.versions.jvmTarget.get()
targetCompatibility = libs.versions.jvmTarget.get()
}
sourceSets {
demo {
java {
@@ -19,16 +15,7 @@ sourceSets {
}
}
compileWrapgenKotlin {
sourceCompatibility = libs.versions.jvmTarget.get()
targetCompatibility = libs.versions.jvmTarget.get()
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
apiVersion = libs.versions.kotlinApi.get()
languageVersion = libs.versions.kotlinLanguage.get()
}
}
compileWrapgenKotlin {}
dependencies {
implementation(libs.gson)

4
orx-no-clear/build.gradle.kts
View File

@@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-noise/build.gradle.kts
View File

@@ -24,10 +24,6 @@ kotlin {
collectScreenshots { }
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-parameters/build.gradle.kts
View File

@@ -5,10 +5,6 @@ plugins {
kotlin {
jvm {
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-quadtree/build.gradle.kts
View File

@@ -26,10 +26,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-shade-styles/build.gradle.kts
View File

@@ -23,10 +23,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-shader-phrases/build.gradle.kts
View File

@@ -26,10 +26,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
orx-shapes/build.gradle.kts
View File

@@ -27,10 +27,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}

4
settings.gradle.kts
View File

@@ -23,7 +23,7 @@ dependencyResolutionManagement {
version("kotlinApi", "1.6")
version("kotlinLanguage", "1.6")
version("kotlin", "1.6.21")
version("jvmTarget", "1.8")
version("jvmTarget", "11")
version("kotlinxCoroutines", "1.6.4")
version("kotlinLogging", "2.1.23")
version("kotlinxSerialization", "1.3.2")
@@ -39,7 +39,7 @@ dependencyResolutionManagement {
version("gson", "2.9.0")
version("antlr", "4.10.1")
version("tensorflow", "0.4.0")
version("jarchivelib", "1.0.0")
version("jarchivelib", "1.2.0")
version("logbackClassic", "1.2.11")
version("minim", "2.2.2")
version("netty", "4.1.79.Final")