From 59870d63984199116551b5580f58b39de25520b9 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:50:48 +0100 Subject: [PATCH 1/9] Kotlin 1.9.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 918510aa52..11078b6fbc 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,7 +15,7 @@ */ // TODO Move me. -val kotlinVersion = "1.8.22" +val kotlinVersion = "1.9.0" plugins { `kotlin-dsl` diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6bc7ead890..6c8a917b86 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -38,7 +38,7 @@ enum class Versions( JSR_305("3.0.2", URL("https://code.google.com/archive/p/jsr-305/")), JUNIT4("4.13.2", URL("https://github.com/junit-team/junit4")), JUNIT5("5.9.2", URL("https://junit.org/junit5/")), - KOTLIN("1.8.22", URL("https://github.com/JetBrains/kotlin")), + KOTLIN("1.9.0", URL("https://github.com/JetBrains/kotlin")), KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")), KOTLINX_COROUTINES("1.6.4", URL("https://github.com/Kotlin/kotlinx.coroutines")), KOTLINX_KOVER("0.6.1", URL("https://github.com/Kotlin/kotlinx-kover")), From b708d80d782220ac18aaec755aa7871cf91ff62b Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:51:26 +0100 Subject: [PATCH 2/9] Kotlin Coroutines 1.7.2. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6c8a917b86..5841190f94 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -40,7 +40,7 @@ enum class Versions( JUNIT5("5.9.2", URL("https://junit.org/junit5/")), KOTLIN("1.9.0", URL("https://github.com/JetBrains/kotlin")), KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")), - KOTLINX_COROUTINES("1.6.4", URL("https://github.com/Kotlin/kotlinx.coroutines")), + KOTLINX_COROUTINES("1.7.2", URL("https://github.com/Kotlin/kotlinx.coroutines")), KOTLINX_KOVER("0.6.1", URL("https://github.com/Kotlin/kotlinx-kover")), KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), KTLINT_GRADLE_PLUGIN("11.0.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), From eb85f87e508590f4fcae064f53ec890d443681e5 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:51:54 +0100 Subject: [PATCH 3/9] Mockito 5.4.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5841190f94..faa873be74 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -44,7 +44,7 @@ enum class Versions( KOTLINX_KOVER("0.6.1", URL("https://github.com/Kotlin/kotlinx-kover")), KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), KTLINT_GRADLE_PLUGIN("11.0.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), - MOCKITO("5.3.0", URL("https://github.com/mockito/mockito")), + MOCKITO("5.4.0", URL("https://github.com/mockito/mockito")), MOCKITO_KOTLIN("4.1.0", URL("https://github.com/mockito/mockito-kotlin")), NEXUS_PLUGIN("1.1.0", URL("https://github.com/gradle-nexus/publish-plugin")), QODANA_PLUGIN("0.1.12", URL("https://www.jetbrains.com/help/qodana/qodana-gradle-plugin.html")), From 0a5ce8dceef05ce7bc829ba6da7a3424bc56150b Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:52:20 +0100 Subject: [PATCH 4/9] Mockito-Kotlin 5.0.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index faa873be74..aba36d464d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -45,7 +45,7 @@ enum class Versions( KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), KTLINT_GRADLE_PLUGIN("11.0.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), MOCKITO("5.4.0", URL("https://github.com/mockito/mockito")), - MOCKITO_KOTLIN("4.1.0", URL("https://github.com/mockito/mockito-kotlin")), + MOCKITO_KOTLIN("5.0.0", URL("https://github.com/mockito/mockito-kotlin")), NEXUS_PLUGIN("1.1.0", URL("https://github.com/gradle-nexus/publish-plugin")), QODANA_PLUGIN("0.1.12", URL("https://www.jetbrains.com/help/qodana/qodana-gradle-plugin.html")), ROBOLECTRIC_ANDROID_ALL("12.1-robolectric-8229987", URL("https://github.com/robolectric/robolectric")); From de2c003d37c50b7af48aa9ab2f08ca49e734ff6b Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:52:52 +0100 Subject: [PATCH 5/9] Nexus Plugin 1.3.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index aba36d464d..cccb303af0 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -46,7 +46,7 @@ enum class Versions( KTLINT_GRADLE_PLUGIN("11.0.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), MOCKITO("5.4.0", URL("https://github.com/mockito/mockito")), MOCKITO_KOTLIN("5.0.0", URL("https://github.com/mockito/mockito-kotlin")), - NEXUS_PLUGIN("1.1.0", URL("https://github.com/gradle-nexus/publish-plugin")), + NEXUS_PLUGIN("1.3.0", URL("https://github.com/gradle-nexus/publish-plugin")), QODANA_PLUGIN("0.1.12", URL("https://www.jetbrains.com/help/qodana/qodana-gradle-plugin.html")), ROBOLECTRIC_ANDROID_ALL("12.1-robolectric-8229987", URL("https://github.com/robolectric/robolectric")); From c4e8464e01122cd4110a16bfeed4635a69c96ec3 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:53:20 +0100 Subject: [PATCH 6/9] Ktlint Gradle Plugin 11.5.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index cccb303af0..d65dbeccf4 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -43,7 +43,7 @@ enum class Versions( KOTLINX_COROUTINES("1.7.2", URL("https://github.com/Kotlin/kotlinx.coroutines")), KOTLINX_KOVER("0.6.1", URL("https://github.com/Kotlin/kotlinx-kover")), KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), - KTLINT_GRADLE_PLUGIN("11.0.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), + KTLINT_GRADLE_PLUGIN("11.5.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), MOCKITO("5.4.0", URL("https://github.com/mockito/mockito")), MOCKITO_KOTLIN("5.0.0", URL("https://github.com/mockito/mockito-kotlin")), NEXUS_PLUGIN("1.3.0", URL("https://github.com/gradle-nexus/publish-plugin")), From d9ef65c55dc028ae7ce43745a4d00f77e788ac07 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:54:12 +0100 Subject: [PATCH 7/9] JUnit5 5.9.3. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index d65dbeccf4..58e09ad54d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -37,7 +37,7 @@ enum class Versions( JMH("1.36", URL("https://openjdk.java.net/projects/code-tools/jmh/")), JSR_305("3.0.2", URL("https://code.google.com/archive/p/jsr-305/")), JUNIT4("4.13.2", URL("https://github.com/junit-team/junit4")), - JUNIT5("5.9.2", URL("https://junit.org/junit5/")), + JUNIT5("5.9.3", URL("https://junit.org/junit5/")), KOTLIN("1.9.0", URL("https://github.com/JetBrains/kotlin")), KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")), KOTLINX_COROUTINES("1.7.2", URL("https://github.com/Kotlin/kotlinx.coroutines")), From 1c16ec9c81d06ff17cec93b3a6b04afe0c6aa65f Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 14 Jul 2023 19:55:19 +0100 Subject: [PATCH 8/9] Android Build Tools 34.0.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 58e09ad54d..d0fa4e2df8 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -21,7 +21,7 @@ enum class Versions( private val url: URL ) { ANDROID_BENCHMARK("1.2.0-alpha13", URL("https://developer.android.com/studio/profile/benchmark")), - ANDROID_BUILD_TOOLS("33.0.1", URL("https://developer.android.com/studio/releases/build-tools")), + ANDROID_BUILD_TOOLS("34.0.0", URL("https://developer.android.com/studio/releases/build-tools")), ANDROID_GRADLE_PLUGIN("8.0.2", URL("https://developer.android.com/tools/revisions/gradle-plugin.html")), ANDROID_LINT("30.0.2", URL("https://github.com/googlesamples/android-custom-lint-rules")), ANDROID_NDK("25.2.9519653", URL("https://developer.android.com/ndk")), From 72b5950bc8946f7e6a06c0330ff05b775a926965 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 15 Jul 2023 18:43:18 +0100 Subject: [PATCH 9/9] Correct typo in benchmarks name. Signed-off-by: Kenneth J. Shackleton --- build.gradle.kts | 2 +- .../{benchamrks => benchmarks}/CommonObjectPoolBenchmark.kt | 2 +- .../selekt/pools/{benchamrks => benchmarks}/Concurrent.kt | 2 +- .../selekt/pools/{benchamrks => benchmarks}/PooledObject.kt | 2 +- .../{benchamrks => benchmarks}/SingleObjectPoolBenchmark.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/{benchamrks => benchmarks}/CommonObjectPoolBenchmark.kt (99%) rename selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/{benchamrks => benchmarks}/Concurrent.kt (94%) rename selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/{benchamrks => benchmarks}/PooledObject.kt (95%) rename selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/{benchamrks => benchmarks}/SingleObjectPoolBenchmark.kt (97%) diff --git a/build.gradle.kts b/build.gradle.kts index e1a3210479..e717e06bcc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -222,7 +222,7 @@ koverReport { excludes { classes("*Test*") packages(listOf( - "*.benchamrks", + "*.benchmarks", "*_generated" )) } diff --git a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/CommonObjectPoolBenchmark.kt b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/CommonObjectPoolBenchmark.kt similarity index 99% rename from selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/CommonObjectPoolBenchmark.kt rename to selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/CommonObjectPoolBenchmark.kt index b427684166..dac155e943 100644 --- a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/CommonObjectPoolBenchmark.kt +++ b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/CommonObjectPoolBenchmark.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.bloomberg.selekt.pools.benchamrks +package com.bloomberg.selekt.pools.benchmarks import com.bloomberg.selekt.pools.CommonObjectPool import com.bloomberg.selekt.pools.IObjectFactory diff --git a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/Concurrent.kt b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/Concurrent.kt similarity index 94% rename from selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/Concurrent.kt rename to selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/Concurrent.kt index 4cbbdf8e14..9964d923ea 100644 --- a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/Concurrent.kt +++ b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/Concurrent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.bloomberg.selekt.pools.benchamrks +package com.bloomberg.selekt.pools.benchmarks import java.util.concurrent.Executors diff --git a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/PooledObject.kt b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/PooledObject.kt similarity index 95% rename from selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/PooledObject.kt rename to selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/PooledObject.kt index 2adf1656c6..13c0001fd7 100644 --- a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/PooledObject.kt +++ b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/PooledObject.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.bloomberg.selekt.pools.benchamrks +package com.bloomberg.selekt.pools.benchmarks import com.bloomberg.selekt.pools.IPooledObject diff --git a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/SingleObjectPoolBenchmark.kt b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/SingleObjectPoolBenchmark.kt similarity index 97% rename from selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/SingleObjectPoolBenchmark.kt rename to selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/SingleObjectPoolBenchmark.kt index 382b7ad9c9..feb17b6393 100644 --- a/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchamrks/SingleObjectPoolBenchmark.kt +++ b/selekt-java/src/jmh/kotlin/com/bloomberg/selekt/pools/benchmarks/SingleObjectPoolBenchmark.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.bloomberg.selekt.pools.benchamrks +package com.bloomberg.selekt.pools.benchmarks import com.bloomberg.selekt.pools.IObjectFactory import com.bloomberg.selekt.pools.IObjectPool