Skip to content
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

Update jarchivelib, add task to list _all_ dependencies, target JVM 11 #256

Merged
merged 3 commits into from
Aug 10, 2022
Merged

Update jarchivelib, add task to list _all_ dependencies, target JVM 11 #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cacc3c
Update jarchivelib, add task to list _all_ dependencies
Vechro Aug 6, 2022
7f6e349
Target JVM 11
Vechro Aug 6, 2022
4762055
Fix publishing details and enable compatibility metadata
Vechro Aug 8, 2022
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
70 changes: 42 additions & 28 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

// root build.gradle
buildscript {
repositories {
Expand All @@ -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"

]

Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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
}
Expand All @@ -323,15 +320,32 @@ 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"))
}
}
}

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" }) {
Expand Down
9 changes: 8 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 4 deletions orx-camera/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-color/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-compositor/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-compute-graph-nodes/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
6 changes: 0 additions & 6 deletions orx-compute-graph/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import EmbedShadersTask

plugins {
kotlin("multiplatform")
kotlin("plugin.serialization")
Expand All @@ -22,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-easing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-fx/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-gradient-descent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-hash-grid/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-image-fit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
15 changes: 1 addition & 14 deletions orx-jvm/orx-tensorflow/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
java {
sourceCompatibility = libs.versions.jvmTarget.get()
targetCompatibility = libs.versions.jvmTarget.get()
}
sourceSets {
demo {
java {
Expand All @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions orx-no-clear/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-noise/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-parameters/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-quadtree/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-shade-styles/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-shader-phrases/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 0 additions & 4 deletions orx-shapes/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ kotlin {
}
}
}
compilations.all {
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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("snakeyaml", "1.30")
Expand Down