From ef85ad7b13be893920ca98329f586dc669306557 Mon Sep 17 00:00:00 2001 From: Tomasz Linkowski Date: Fri, 16 Aug 2019 10:48:49 +0200 Subject: [PATCH] Apply pl.tlinkowski.gradle.my.superpom plugin Starts #4 (converted build.gradle and settings.gradle to Kotlin DSL) Fixes #5 (through my SuperPOM) Fixes #6 (through Kordamp) Starts #12 (through Gradle Modules Plugin) Fixes #14 (through Kordamp) Fixes #15 (through my SuperPOM) Fixes #20 (through Kordamp) --- .appveyor.yml | 39 ++ .gitignore | 15 +- .idea/.gitignore | 7 +- .idea/codeStyles/Project.xml | 156 ------ .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/copyright/Apache_2_0.xml | 6 - .idea/copyright/profiles_settings.xml | 7 - .idea/inspectionProfiles/Project_Default.xml | 493 ------------------ .travis.yml | 25 +- CHANGELOG.md | 0 build.gradle | 134 ----- build.gradle.kts | 81 +++ gradle.properties | 24 + gradle/configure-compile-tasks.gradle | 46 -- gradle/dependency-updates.gradle | 37 -- gradle/ide.gradle | 21 - subprojects/lombok.config => lombok.config | 0 settings.gradle => settings.gradle.kts | 12 +- subprojects/unij-api/unij-api.gradle | 2 +- .../unij-bundle-eclipse-jdk8.gradle | 2 +- .../unij-bundle-guava-jdk8.gradle | 2 +- .../unij-bundle-jdk11.gradle | 2 +- .../unij-bundle-jdk8/unij-bundle-jdk8.gradle | 2 +- .../unij-collect-eclipse.gradle | 2 +- .../unij-collect-guava.gradle | 2 +- .../unij-collect-jdk10.gradle | 2 +- .../unij-collect-jdk8.gradle | 2 +- .../unij-misc-jdk11/unij-misc-jdk11.gradle | 2 +- .../unij-misc-jdk8/unij-misc-jdk8.gradle | 2 +- subprojects/unij-test/unij-test.gradle | 2 - 30 files changed, 201 insertions(+), 931 deletions(-) create mode 100644 .appveyor.yml delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/copyright/Apache_2_0.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 CHANGELOG.md delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 gradle.properties delete mode 100644 gradle/configure-compile-tasks.gradle delete mode 100644 gradle/dependency-updates.gradle delete mode 100644 gradle/ide.gradle rename subprojects/lombok.config => lombok.config (100%) rename settings.gradle => settings.gradle.kts (71%) diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..609622c --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,39 @@ +# reference: https://www.appveyor.com/docs/appveyor-yml/ + +image: Visual Studio 2017 # https://www.appveyor.com/docs/windows-images-software/ + +version: "#{build} ({branch})" + +branches: + except: + - /^\d+\.\d+\.\d+$/ # skip builds related to addTemporaryVersionTag + +#region JAVA +environment: + matrix: + - JAVA_HOME: C:\Program Files\Java\jdk12 + +install: + - SET PATH=%JAVA_HOME%\bin;%PATH + - java --version +#endregion + +#region GRADLE +build_script: + - gradlew.bat assemble + +test_script: + - gradlew.bat check --stacktrace + +cache: + - C:\Users\appveyor\.gradle + +on_finish: + # upload test results via REST-api: https://github.com/appveyor/ci/issues/92#issuecomment-307242316 + - ps: | + $wc = New-Object 'System.Net.WebClient' + Get-ChildItem . -Name -Recurse 'TEST-*.xml' | + Foreach-Object { + $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_)) + } +#endregion diff --git a/.gitignore b/.gitignore index c8414b3..779ff2d 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,17 @@ gradle-app.setting # # IntelliJ # -*.iml \ No newline at end of file +*.iml + +# +# Node.js +# +/node_modules/ +/package-lock.json + +# +# SuperPOM +# +/.grenrc.yml +/package.json +/release.bat diff --git a/.idea/.gitignore b/.idea/.gitignore index 8c47ef2..e230133 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -39,4 +39,9 @@ out/ # Other /compiler.xml -/misc.xml \ No newline at end of file +/misc.xml + +# SuperPOM +/codeStyles/ +/copyright/ +/inspectionProfiles/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index cc24705..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/Apache_2_0.xml b/.idea/copyright/Apache_2_0.xml deleted file mode 100644 index e1732e0..0000000 --- a/.idea/copyright/Apache_2_0.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 5e1987a..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 4497f0b..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,493 +0,0 @@ - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1f541be..4e3c744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,28 @@ language: java -jdk: openjdk11 +jdk: openjdk12 sudo: false # faster builds +branches: + except: + - /^\d+\.\d+\.\d+$/ # skip builds related to addTemporaryVersionTag + before_install: - - chmod +x gradlew - - pip install --user codecov + - chmod +x gradlew # https://stackoverflow.com/questions/33820638/travis-yml-gradlew-permission-denied/33820642#33820642 + - pip install --user codecov # https://github.com/codecov/codecov-python#configuration + +#region https://docs.travis-ci.com/user/languages/java/#caching +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ +#endregion + +script: + - ./gradlew check --stacktrace after_success: - - codecov + - codecov # https://github.com/codecov/codecov-python#configuration diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e69de29 diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f48a7cc..0000000 --- a/build.gradle +++ /dev/null @@ -1,134 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright 2018 Tomasz Linkowski. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -plugins { - // https://github.com/ben-manes/gradle-versions-plugin - id "com.github.ben-manes.versions" version "0.21.0" - - // https://aalmiray.github.io/kordamp-gradle-plugins/ - id "org.kordamp.gradle.base" version "0.15.0" - - // https://github.com/melix/jmh-gradle-plugin - id "me.champeau.gradle.jmh" version "0.4.8" apply false -} - -config { - info { - name = "UniJ" - vendor = "Tomasz Linkowski" - inceptionYear = "2018" - description = "Universal cross-JDK API provider for immutable collections" - - links { - website = "https://unij.tlinkowski.pl/" - issueTracker = "https://github.com/tlinkowski/UniJ/issues" - scm = "https://github.com/tlinkowski/UniJ.git" - } - - people { - person { - id = "tlinkowski" - name = "Tomasz Linkowski" - url = "https://tlinkowski.pl/" - roles = ["developer"] - } - } - } - - licensing { - licenses { - license { - id = "Apache-2.0" - } - } - } -} - -ext.lombokVersion = "1.18.6" // https://projectlombok.org/changelog -ext.slf4jVersion = "1.7.26" // https://www.slf4j.org/ - -allprojects { - repositories { - mavenCentral() - } -} - -subprojects { - group = "pl.tlinkowski.unij" - - apply plugin: "java" // https://docs.gradle.org/current/userguide/java_plugin.html - apply plugin: "groovy" // https://docs.gradle.org/current/userguide/groovy_plugin.html - apply plugin: "jacoco" // https://docs.gradle.org/current/userguide/jacoco_plugin.html - apply plugin: "me.champeau.gradle.jmh" - - apply from: "$rootDir/gradle/configure-compile-tasks.gradle" - - configurations { - testCompileOnly.extendsFrom compileOnly - } - - dependencies { - compileOnly group: "org.projectlombok", name: "lombok", version: lombokVersion - annotationProcessor group: "org.projectlombok", name: "lombok", version: lombokVersion - - compileOnly group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2" - compileOnly group: "org.jetbrains.kotlin", name: "kotlin-annotations-jvm", version: "1.3.21" - } - - /** - * Code Coverage (JaCoCo) - * https://github.com/jacoco/jacoco - */ - jacocoTestReport { - reports { - xml.enabled = true - html.enabled = project.hasProperty("generateHtmlJacocoReport") - } - } - check.dependsOn jacocoTestReport - - jacocoTestCoverageVerification { - violationRules { - rule { - limit { - counter = 'LINE' - minimum = 0.99 - } - } - } - } - check.dependsOn jacocoTestCoverageVerification - - /** - * BENCHMARKS - * http://openjdk.java.net/projects/code-tools/jmh/ - */ - jmh { - /* - * Note that when using "separateClasspathJAR" option and running the benchmark on Windows, - * the following four resources must be on the same drive (otherwise, "'other' has different root" is thrown): - * 1) this project - * 2) JDK - * 3) Gradle user home dir (can be set using GRADLE_USER_HOME environment variable) - * 4) TEMP dir (can be set using System properties through "java.io.tmpdir") - */ - jvmArgsAppend = ["-Djmh.separateClasspathJAR=true"] // https://bugs.openjdk.java.net/browse/CODETOOLS-7902106 - } -} - -apply from: "$rootDir/gradle/dependency-updates.gradle" -apply from: "$rootDir/gradle/ide.gradle" diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..057beab --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,81 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * Copyright 2018 Tomasz Linkowski. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import me.champeau.gradle.JMHPlugin +import me.champeau.gradle.JMHPluginExtension + +plugins { + // https://github.com/tlinkowski/tlinkowski-superpom + id("pl.tlinkowski.gradle.my.superpom") + + // https://github.com/melix/jmh-gradle-plugin + id("me.champeau.gradle.jmh") version "0.4.8" apply false +} + +config { + info { + name = "UniJ" + inceptionYear = "2018" + description = "Universal cross-JDK API provider for immutable collections" + + links { + website = "https://github.com/tlinkowski/UniJ" + issueTracker = "$website/issues" + scm = "$website.git" + } + } +} + +subprojects { + apply { + plugin(JMHPlugin::class) + } + + val testCompileOnly by configurations + val compileOnly by configurations + val annotationProcessor by configurations + + configurations { + testCompileOnly.extendsFrom(compileOnly) + } + + dependencies { + // https://projectlombok.org/changelog + val lombokVersion: String by project + compileOnly(group = "org.projectlombok", name = "lombok", version = lombokVersion) + annotationProcessor(group = "org.projectlombok", name = "lombok", version = lombokVersion) + + compileOnly(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2") + compileOnly(group = "org.jetbrains.kotlin", name = "kotlin-annotations-jvm", version = "1.3.21") + } + + /** + * BENCHMARKS + * http://openjdk.java.net/projects/code-tools/jmh/ + */ + configure { + /* + * Note that when using "separateClasspathJAR" option and running the benchmark on Windows, + * the following four resources must be on the same drive (otherwise, "'other' has different root" is thrown): + * 1) this project + * 2) JDK + * 3) Gradle user home dir (can be set using GRADLE_USER_HOME environment variable) + * 4) TEMP dir (can be set using System properties through "java.io.tmpdir") + */ + jvmArgsAppend = listOf("-Djmh.separateClasspathJAR=true") // https://bugs.openjdk.java.net/browse/CODETOOLS-7902106 + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..b68dcea --- /dev/null +++ b/gradle.properties @@ -0,0 +1,24 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright 2019 Tomasz Linkowski. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +group=pl.tlinkowski.unij +# Release scopes: [major, minor, patch] +reckon.scope=minor +# Dependencies +mySuperpomVersion=0.1.4 +lombokVersion=1.18.6 +slf4jVersion=1.7.26 diff --git a/gradle/configure-compile-tasks.gradle b/gradle/configure-compile-tasks.gradle deleted file mode 100644 index bd3570a..0000000 --- a/gradle/configure-compile-tasks.gradle +++ /dev/null @@ -1,46 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright 2018 Tomasz Linkowski. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Configures all JavaCompile tasks with proper encoding and compiler tasks. - */ -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - options.compilerArgs.add("-Xlint:unchecked") -} - -/** - * For the given Java compile task, sets javac --release option to the given value. - * - * https://docs.oracle.com/en/java/javase/11/tools/javac.html - */ -def setJavacReleaseOption = { JavaCompile task, String releaseArg -> - assert !task.options.compilerArgs.contains("--release"): "--release option specified more than once for " + task - task.options.compilerArgs.addAll(["--release", releaseArg]) -} - -/** - * Sets javac --release option: - * - to the given value, for the "main/java" compile task, - * - to "11", for all other Java compile tasks. - */ -ext.javaRelease = { String mainReleaseArg -> - setJavacReleaseOption(compileJava, mainReleaseArg) - setJavacReleaseOption(compileTestJava, "11") - setJavacReleaseOption(compileJmhJava, "11") -} \ No newline at end of file diff --git a/gradle/dependency-updates.gradle b/gradle/dependency-updates.gradle deleted file mode 100644 index cfc21e5..0000000 --- a/gradle/dependency-updates.gradle +++ /dev/null @@ -1,37 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright 2018 Tomasz Linkowski. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Informs about possible updates of project dependencies. - * - * @link https://github.com/ben-manes/gradle-versions-plugin - * - * Requires the following snippet in main build.gradle: - * plugins { id "com.github.ben-manes.versions" version "0.20.0" } - */ - -// rejects Release Candidates from the suggestions -dependencyUpdates.resolutionStrategy = { - componentSelection { rules -> - rules.all { ComponentSelection selection -> - if (selection.candidate.version ==~ /(?i).*[.-](?:alpha|beta|rc|ea|m|preview)(?:[.\d-].*)?/) { - selection.reject("Release Candidate") - } - } - } -} diff --git a/gradle/ide.gradle b/gradle/ide.gradle deleted file mode 100644 index 8e989c5..0000000 --- a/gradle/ide.gradle +++ /dev/null @@ -1,21 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright 2018 Tomasz Linkowski. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -allprojects { - apply plugin: "idea" -} \ No newline at end of file diff --git a/subprojects/lombok.config b/lombok.config similarity index 100% rename from subprojects/lombok.config rename to lombok.config diff --git a/settings.gradle b/settings.gradle.kts similarity index 71% rename from settings.gradle rename to settings.gradle.kts index 49c7f80..9c0b849 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -17,16 +17,14 @@ */ buildscript { repositories { - gradlePluginPortal() + mavenCentral() } dependencies { - classpath group: "org.kordamp.gradle", name: "settings-gradle-plugin", version: "0.15.0" + // https://github.com/tlinkowski/tlinkowski-superpom + val mySuperpomVersion: String by settings + classpath(group = "pl.tlinkowski.gradle.my", name = "my-settings-gradle-plugin", version = mySuperpomVersion) } } -apply plugin: "org.kordamp.gradle.settings" - -projects { - directories = ["docs", "subprojects"] -} +apply(plugin = "pl.tlinkowski.gradle.my.settings") rootProject.name = "UniJ" diff --git a/subprojects/unij-api/unij-api.gradle b/subprojects/unij-api/unij-api.gradle index 78b784a..680f7bd 100644 --- a/subprojects/unij-api/unij-api.gradle +++ b/subprojects/unij-api/unij-api.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { implementation group: "org.slf4j", name: "slf4j-api", version: slf4jVersion diff --git a/subprojects/unij-bundle-eclipse-jdk8/unij-bundle-eclipse-jdk8.gradle b/subprojects/unij-bundle-eclipse-jdk8/unij-bundle-eclipse-jdk8.gradle index 5bc9ec6..10cc47a 100644 --- a/subprojects/unij-bundle-eclipse-jdk8/unij-bundle-eclipse-jdk8.gradle +++ b/subprojects/unij-bundle-eclipse-jdk8/unij-bundle-eclipse-jdk8.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-bundle-guava-jdk8/unij-bundle-guava-jdk8.gradle b/subprojects/unij-bundle-guava-jdk8/unij-bundle-guava-jdk8.gradle index 1a0cf78..6c59730 100644 --- a/subprojects/unij-bundle-guava-jdk8/unij-bundle-guava-jdk8.gradle +++ b/subprojects/unij-bundle-guava-jdk8/unij-bundle-guava-jdk8.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-bundle-jdk11/unij-bundle-jdk11.gradle b/subprojects/unij-bundle-jdk11/unij-bundle-jdk11.gradle index 2581f2b..be795a7 100644 --- a/subprojects/unij-bundle-jdk11/unij-bundle-jdk11.gradle +++ b/subprojects/unij-bundle-jdk11/unij-bundle-jdk11.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "11" +modularity.standardJavaRelease "11" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-bundle-jdk8/unij-bundle-jdk8.gradle b/subprojects/unij-bundle-jdk8/unij-bundle-jdk8.gradle index 619256b..4ef139a 100644 --- a/subprojects/unij-bundle-jdk8/unij-bundle-jdk8.gradle +++ b/subprojects/unij-bundle-jdk8/unij-bundle-jdk8.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-collect-eclipse/unij-collect-eclipse.gradle b/subprojects/unij-collect-eclipse/unij-collect-eclipse.gradle index 900fcb6..11ac5da 100644 --- a/subprojects/unij-collect-eclipse/unij-collect-eclipse.gradle +++ b/subprojects/unij-collect-eclipse/unij-collect-eclipse.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-collect-guava/unij-collect-guava.gradle b/subprojects/unij-collect-guava/unij-collect-guava.gradle index 2b94e6b..9271524 100644 --- a/subprojects/unij-collect-guava/unij-collect-guava.gradle +++ b/subprojects/unij-collect-guava/unij-collect-guava.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-collect-jdk10/unij-collect-jdk10.gradle b/subprojects/unij-collect-jdk10/unij-collect-jdk10.gradle index 8cead9f..343fbe3 100644 --- a/subprojects/unij-collect-jdk10/unij-collect-jdk10.gradle +++ b/subprojects/unij-collect-jdk10/unij-collect-jdk10.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "10" +modularity.standardJavaRelease "10" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-collect-jdk8/unij-collect-jdk8.gradle b/subprojects/unij-collect-jdk8/unij-collect-jdk8.gradle index 59a1a4c..e1a3fea 100644 --- a/subprojects/unij-collect-jdk8/unij-collect-jdk8.gradle +++ b/subprojects/unij-collect-jdk8/unij-collect-jdk8.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-misc-jdk11/unij-misc-jdk11.gradle b/subprojects/unij-misc-jdk11/unij-misc-jdk11.gradle index 9f834e3..580cee7 100644 --- a/subprojects/unij-misc-jdk11/unij-misc-jdk11.gradle +++ b/subprojects/unij-misc-jdk11/unij-misc-jdk11.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "11" +modularity.standardJavaRelease "11" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-misc-jdk8/unij-misc-jdk8.gradle b/subprojects/unij-misc-jdk8/unij-misc-jdk8.gradle index 59a1a4c..e1a3fea 100644 --- a/subprojects/unij-misc-jdk8/unij-misc-jdk8.gradle +++ b/subprojects/unij-misc-jdk8/unij-misc-jdk8.gradle @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "8" +modularity.mixedJavaRelease "8" dependencies { compile project(":unij-api") diff --git a/subprojects/unij-test/unij-test.gradle b/subprojects/unij-test/unij-test.gradle index 493cff8..ce63ba3 100644 --- a/subprojects/unij-test/unij-test.gradle +++ b/subprojects/unij-test/unij-test.gradle @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -javaRelease "11" - dependencies { compile project(":unij-api") runtimeOnly group: "org.slf4j", name: "slf4j-simple", version: slf4jVersion