diff --git a/LICENSE b/LICENSE index 0a8419c..48f72ea 100644 --- a/LICENSE +++ b/LICENSE @@ -19,12 +19,6 @@ Copyright 2021 JetBrains s.r.o. - - SLF4J - Simple facade or abstraction for various logging frameworks - [MIT License] - http://www.slf4j.org - Copyright 2021 - QOS.ch - - Conversant Disruptor - Disruptor is the highest performing intra-thread transfer mechanism available in Java. [The Apache Software License, Version 2.0] https://github.com/conversant/disruptor @@ -45,9 +39,3 @@ JetBrains s.r.o. and Kotlin Programming Language contributors Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply See: https://github.com/JetBrains/kotlin/blob/master/license/README.md - - - PropertyLoader - Property annotation and loader for fields - [The Apache Software License, Version 2.0] - https://git.dorkbox.com/dorkbox/PropertyLoader - Copyright 2021 - Dorkbox LLC diff --git a/LICENSE.MIT b/LICENSE.MIT deleted file mode 100644 index 2e9f5aa..0000000 --- a/LICENSE.MIT +++ /dev/null @@ -1,21 +0,0 @@ - MIT License - - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 59d420d..42b56e7 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Maven Info com.dorkbox ObjectPool - 3.3 + 3.4 ``` @@ -61,7 +61,7 @@ Gradle Info ``` dependencies { ... - implementation "com.dorkbox:ObjectPool:3.3" + implementation "com.dorkbox:ObjectPool:3.4" } ```` diff --git a/build.gradle.kts b/build.gradle.kts index f868121..dbfcd73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,6 @@ * limitations under the License. */ -import dorkbox.gradle.kotlin import java.time.Instant @@ -25,18 +24,14 @@ import java.time.Instant /////////////////////////////// gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace! -gradle.startParameter.warningMode = WarningMode.All plugins { - java - - id("com.dorkbox.GradleUtils") version "1.17" - id("com.dorkbox.Licensing") version "2.5.5" + id("com.dorkbox.GradleUtils") version "2.6" + id("com.dorkbox.Licensing") version "2.7" id("com.dorkbox.VersionUpdate") version "2.3" - id("com.dorkbox.GradlePublish") version "1.10" - id("com.dorkbox.GradleModuleInfo") version "1.1" + id("com.dorkbox.GradlePublish") version "1.11" - kotlin("jvm") version "1.4.32" + kotlin("jvm") version "1.5.0" } object Extras { @@ -44,7 +39,7 @@ object Extras { const val group = "com.dorkbox" const val name = "ObjectPool" const val id = "ObjectPool" - const val version = "3.3" + const val version = "3.4" const val vendor = "Dorkbox LLC" const val vendorUrl = "https://dorkbox.com" @@ -59,9 +54,9 @@ object Extras { ///// assign 'Extras' /////////////////////////////// GradleUtils.load("$projectDir/../../gradle.properties", Extras) -GradleUtils.fixIntellijPaths() -GradleUtils.defaultResolutionStrategy() +GradleUtils.defaults() GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8) +GradleUtils.jpms(JavaVersion.VERSION_1_9) licensing { @@ -72,32 +67,6 @@ licensing { } } -sourceSets { - main { - kotlin { - setSrcDirs(listOf("src")) - - // want to include kotlin files for the source. 'setSrcDirs' resets includes... - include("**/*.kt") - } - } - - test { - kotlin { - setSrcDirs(listOf("test")) - - // want to include java files for the source. 'setSrcDirs' resets includes... - include("**/*.java", "**/*.kt") - } - } -} - -repositories { - mavenLocal() // this must be first! - jcenter() -} - - tasks.jar.get().apply { manifest { // https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html @@ -110,17 +79,14 @@ tasks.jar.get().apply { attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}" attributes["Implementation-Version"] = Extras.buildDate attributes["Implementation-Vendor"] = Extras.vendor - - attributes["Automatic-Module-Name"] = Extras.id } } dependencies { - implementation("com.dorkbox:Updates:1.0") + implementation("com.dorkbox:Updates:1.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Extras.coroutineVer}") - implementation("org.slf4j:slf4j-api:1.7.30") implementation("com.conversantmedia:disruptor:1.2.19") testImplementation("junit:junit:4.13.2") diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..44dcb84 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties +org.gradle.jvmargs=-Dfile.encoding=UTF-8 + +#org.gradle.warning.mode=(all,fail,none,summary) +org.gradle.warning.mode=all + +#org.gradle.daemon=false +# default is 3 hours, this is 1 minute +org.gradle.daemon.idletimeout=60000 + +#org.gradle.console=(auto,plain,rich,verbose) +org.gradle.console=auto + +#org.gradle.logging.level=(quiet,warn,lifecycle,info,debug) +org.gradle.logging.level=lifecycle diff --git a/src/dorkbox/objectPool/ObjectPool.kt b/src/dorkbox/objectPool/ObjectPool.kt index 80c520b..22213e6 100644 --- a/src/dorkbox/objectPool/ObjectPool.kt +++ b/src/dorkbox/objectPool/ObjectPool.kt @@ -33,7 +33,7 @@ object ObjectPool { /** * Gets the version number. */ - const val version = "3.3" + const val version = "3.4" init { // Add this project to the updates system, which verifies this class + UUID + version information diff --git a/src9/dorkbox/objectPool/EmptyClass.java b/src9/dorkbox/objectPool/EmptyClass.java new file mode 100644 index 0000000..e261af0 --- /dev/null +++ b/src9/dorkbox/objectPool/EmptyClass.java @@ -0,0 +1,24 @@ +/* + * Copyright 2021 dorkbox, llc + * + * 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. + */ + +package dorkbox.objectPool; + +/** + * Required for intellij to not complain regarding `module-info` for a multi-release jar. + * This file is completely ignored by the gradle build process + */ +public +class EmptyClass {} diff --git a/src9/module-info.java b/src9/module-info.java new file mode 100644 index 0000000..0f7f63c --- /dev/null +++ b/src9/module-info.java @@ -0,0 +1,12 @@ +module dorkbox.objectpool { + exports dorkbox.objectPool; + +// requires dorkbox.updates; +// +// requires com.conversantmedia.disruptor; +// +// requires kotlinx.coroutines.core.jvm; +// requires kotlin.stdlib; +// +// requires java.base; +}