From 255f2e228633c7b434269a5ba956432e59bbbc24 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sun, 11 Jul 2021 13:46:03 +0300 Subject: [PATCH] [Build] Move sourceCompatibility option to the root build file --- build.gradle | 5 +++++ .../{imgui/generate => tool/generator}/GenerateLibs.groovy | 2 +- imgui-app/build.gradle | 2 -- imgui-binding/build.gradle | 4 +--- imgui-lwjgl3/build.gradle | 2 -- 5 files changed, 7 insertions(+), 8 deletions(-) rename buildSrc/src/main/groovy/{imgui/generate => tool/generator}/GenerateLibs.groovy (99%) diff --git a/build.gradle b/build.gradle index cd4bb9c..2137cd1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,14 @@ import tool.UpVersion allprojects { group 'imgui-java' version property('version') + repositories { mavenCentral() } + + tasks.withType(JavaCompile) { + sourceCompatibility = JavaVersion.VERSION_1_8 + } } tasks.register('upVersion', UpVersion) diff --git a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy b/buildSrc/src/main/groovy/tool/generator/GenerateLibs.groovy similarity index 99% rename from buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy rename to buildSrc/src/main/groovy/tool/generator/GenerateLibs.groovy index 2829a84..c253106 100644 --- a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy +++ b/buildSrc/src/main/groovy/tool/generator/GenerateLibs.groovy @@ -1,4 +1,4 @@ -package imgui.generate +package tool.generator import com.badlogic.gdx.jnigen.* import groovy.transform.CompileStatic diff --git a/imgui-app/build.gradle b/imgui-app/build.gradle index 3b59de2..8362a2b 100644 --- a/imgui-app/build.gradle +++ b/imgui-app/build.gradle @@ -6,8 +6,6 @@ plugins { id 'signing' } -sourceCompatibility = 1.8 - repositories { mavenCentral() } diff --git a/imgui-binding/build.gradle b/imgui-binding/build.gradle index 340e2eb..be0e6d2 100644 --- a/imgui-binding/build.gradle +++ b/imgui-binding/build.gradle @@ -1,4 +1,4 @@ -import imgui.generate.GenerateLibs +import tool.generator.GenerateLibs plugins { id 'java' @@ -7,8 +7,6 @@ plugins { id 'signing' } -sourceCompatibility = 1.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 c638e3a..db33a54 100644 --- a/imgui-lwjgl3/build.gradle +++ b/imgui-lwjgl3/build.gradle @@ -5,8 +5,6 @@ plugins { id 'signing' } -sourceCompatibility = 1.8 - dependencies { implementation platform("org.lwjgl:lwjgl-bom:3.2.3")