From 8a560ca4398cf7865c084b1ceec9bdbad9e29f17 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Wed, 14 Dec 2022 12:01:42 +0200 Subject: [PATCH] [API] Fix dependency tree issue for `imgui-java-app` resolve #75 resolve #127 Removed shadowing for `imgui-java-app.jar` which is published to Maven Central. Shadow Jar now has a prefix `-all` - for those one who prefer to use raw jars instead dependencies in maven/gradle. --- build.gradle | 7 ------- example/build.gradle | 6 ++++-- imgui-app/build.gradle | 9 +++++---- imgui-binding-natives/build.gradle | 6 ++++++ imgui-binding/build.gradle | 6 ++++++ imgui-lwjgl3/build.gradle | 6 ++++++ 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 64064a64..bc335ed8 100644 --- a/build.gradle +++ b/build.gradle @@ -12,13 +12,6 @@ allprojects { mavenCentral() } - tasks.withType(JavaCompile).tap { - configureEach { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - } - tasks.withType(Jar).tap { configureEach { from(project.rootDir) { diff --git a/example/build.gradle b/example/build.gradle index a79cec19..b7e816a8 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -2,8 +2,10 @@ plugins { id 'application' } -repositories { - mavenCentral() +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } } application { diff --git a/imgui-app/build.gradle b/imgui-app/build.gradle index ee0eaf41..e67c105e 100644 --- a/imgui-app/build.gradle +++ b/imgui-app/build.gradle @@ -1,13 +1,15 @@ plugins { id 'java-library' - id 'com.github.johnrengelman.shadow' version '7.0.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' id 'checkstyle' id 'maven-publish' id 'signing' } -repositories { - mavenCentral() +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } } dependencies { @@ -44,7 +46,6 @@ jar { shadowJar { with jar - archiveClassifier.set(null) } apply from: "$rootDir/publish.gradle" diff --git a/imgui-binding-natives/build.gradle b/imgui-binding-natives/build.gradle index 4d3eb558..08649076 100644 --- a/imgui-binding-natives/build.gradle +++ b/imgui-binding-natives/build.gradle @@ -4,6 +4,12 @@ plugins { id 'signing' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + def packageName = 'imgui-java-natives-linux' def packageDesc = 'Native binaries for imgui-java binding for Linux' def moduleName = 'imgui.natives.linux' diff --git a/imgui-binding/build.gradle b/imgui-binding/build.gradle index b28535c3..3b834adf 100644 --- a/imgui-binding/build.gradle +++ b/imgui-binding/build.gradle @@ -7,6 +7,12 @@ plugins { id 'signing' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.2' diff --git a/imgui-lwjgl3/build.gradle b/imgui-lwjgl3/build.gradle index d39a6966..af313580 100644 --- a/imgui-lwjgl3/build.gradle +++ b/imgui-lwjgl3/build.gradle @@ -5,6 +5,12 @@ plugins { id 'signing' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + dependencies { implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")