Update versions

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# configuration options available at https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    allow:
+      - dependency-type: "all"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    allow:
+      - dependency-type: "all"

.github/workflows/build.yml

@@ -15,16 +15,16 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@v3
       with:
         arguments: build

.github/workflows/gradle-publish.yml

@@ -20,24 +20,24 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@v3
       with:
         arguments: -Pversion=${{ github.event.release.tag_name }} build
 
     # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
     # the publishing section of your build.gradle
     - name: Publish to GitHub Packages
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@v3
       with:
         arguments: -Pversion=${{ github.event.release.tag_name }} publish
       env:

.gitignore

@@ -1,3 +1,19 @@
-build/
+.gradle
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+build
+.kotlintest
+out
+*.ipr
+*.iml
+*.iws
+
+.DS_Store
+
+*.bkp
 .idea/
-.gradle/

README.md

@@ -1,6 +1,12 @@
 # native_memory_allocator
 
-O(1) malloc for off-heap storage in Kotlin, and a NativeMemoryMap based on [Caffeine](https://github.com/ben-manes/caffeine) so you don't have to call it directly.
+O(1) malloc for off-heap storage in Kotlin, and a NativeMemoryMap based on [Caffeine](https://github.com/ben-manes/caffeine).
+
+## Java Version
+
+Project is built with Java 11.  Works at runtime with any Java >= 11.
+
+Used in production and regularly tested with Java 17 and 21 LTS versions.
 
 ## Motivation
 

benchmarks/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
-    kotlin("jvm")
-    id("me.champeau.jmh") version "0.6.8"
+    kotlin("jvm") version libs.versions.kotlin.core
+    alias(libs.plugins.jmh)
+
 }
 
 repositories {
@@ -9,10 +10,10 @@ repositories {
 
 dependencies {
     implementation(rootProject)
-    implementation("io.github.microutils:kotlin-logging:2.1.21")
-    implementation("ch.qos.logback:logback-classic:1.2.11")
-    implementation("org.rocksdb:rocksdbjni:7.9.2")
-    implementation("org.openjdk.jmh:jmh-core:1.35")
+    implementation(libs.kotlin.logging)
+    implementation(libs.logback.classic)
+    implementation(libs.rocksdb.jni)
+    implementation(libs.jmh.core)
 }
 
 jmh {

benchmarks/src/jmh/kotlin/com/target/nativememoryallocator/benchmarks/OffHeapGetPutBenchmark.kt

@@ -3,8 +3,15 @@ package com.target.nativememoryallocator.benchmarks
 import com.target.nativememoryallocator.benchmarks.impl.NMAOffHeapCache
 import com.target.nativememoryallocator.benchmarks.impl.RocksDBOffHeapCache
 import com.target.nativememoryallocator.benchmarks.impl.UnimplementedOffHeapCache
-import mu.KotlinLogging
-import org.openjdk.jmh.annotations.*
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.openjdk.jmh.annotations.Benchmark
+import org.openjdk.jmh.annotations.Group
+import org.openjdk.jmh.annotations.GroupThreads
+import org.openjdk.jmh.annotations.Param
+import org.openjdk.jmh.annotations.Scope
+import org.openjdk.jmh.annotations.Setup
+import org.openjdk.jmh.annotations.State
+import org.openjdk.jmh.annotations.TearDown
 import java.nio.ByteBuffer
 
 private val logger = KotlinLogging.logger {}

benchmarks/src/jmh/kotlin/com/target/nativememoryallocator/benchmarks/impl/NMAOffHeapCache.kt

@@ -1,12 +1,12 @@
 package com.target.nativememoryallocator.benchmarks.impl
 
 import com.target.nativememoryallocator.allocator.NativeMemoryAllocatorBuilder
-import com.target.nativememoryallocator.buffer.OnHeapMemoryBuffer
 import com.target.nativememoryallocator.benchmarks.OffHeapCache
+import com.target.nativememoryallocator.buffer.OnHeapMemoryBuffer
 import com.target.nativememoryallocator.map.NativeMemoryMapBackend
 import com.target.nativememoryallocator.map.NativeMemoryMapBuilder
 import com.target.nativememoryallocator.map.NativeMemoryMapSerializer
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.nio.ByteBuffer
 
 private val logger = KotlinLogging.logger {}

benchmarks/src/jmh/kotlin/com/target/nativememoryallocator/benchmarks/impl/RocksDBOffHeapCache.kt

@@ -1,7 +1,7 @@
 package com.target.nativememoryallocator.benchmarks.impl
 
 import com.target.nativememoryallocator.benchmarks.OffHeapCache
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.rocksdb.RocksDB
 import java.io.File
 import java.nio.ByteBuffer

build.gradle.kts

@@ -1,28 +1,16 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven { url = uri("https://plugins.gradle.org/m2/") }
     }
 }
 
 plugins {
-    kotlin("jvm") version "1.6.10"
-    `maven-publish`
-    jacoco
-    id("org.jetbrains.dokka") version "1.6.10" apply false
+    kotlin("jvm") version libs.versions.kotlin.core
+//    `maven-publish`
 }
 
-// Conditionally enable dokka only when dokkaEnabled=true property is set.
-// Latest version 1.6.10 depends on vulnerable versions of jackson/jsoup/etc.
-val dokkaEnabled = (project.properties["dokkaEnabled"]?.toString()?.toBoolean()) ?: false
-project.logger.lifecycle("dokkaEnabled = $dokkaEnabled")
-
-if (dokkaEnabled) {
-    apply(plugin = "org.jetbrains.dokka")
-}
+val jvmTargetVersion: String by project
 
 group = "com.target"
 java.sourceCompatibility = JavaVersion.VERSION_11
@@ -33,62 +21,39 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-    implementation("io.github.microutils:kotlin-logging:2.1.21")
-    implementation("org.objenesis:objenesis:3.2")
-    implementation("io.micrometer:micrometer-core:1.8.1")
-    api("com.github.ben-manes.caffeine:caffeine:3.0.5")
+    implementation(libs.kotlin.logging)
+    implementation(libs.objnesis)
+    implementation(libs.micrometer.core)
+    api(libs.caffeine)
 
-    testImplementation("org.spekframework.spek2:spek-dsl-jvm:2.0.17")
-    testImplementation("org.spekframework.spek2:spek-runner-junit5:2.0.17")
-    testImplementation("io.mockk:mockk:1.12.2")
-    testImplementation(platform("org.junit:junit-bom:5.8.2"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("ch.qos.logback:logback-classic:1.2.10")
-    testImplementation("com.google.guava:guava-testlib:31.0.1-jre")
+    testImplementation(rootProject.libs.bundles.testing)
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
+tasks {
+    java {
+        withSourcesJar()
+        toolchain { languageVersion.set(JavaLanguageVersion.of(jvmTargetVersion)) }
     }
-}
 
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
-
-java {
-    withSourcesJar()
-}
-
-jacoco {
-    toolVersion = "0.8.7"
-}
-
-tasks.jacocoTestReport {
-    reports {
-        xml.isEnabled = true
-        csv.isEnabled = false
-        html.destination = file("${buildDir}/jacocoHtml")
+    withType<Test> {
+        useJUnitPlatform()
     }
 }
 
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/target/native_memory_allocator")
-            credentials {
-                username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
-                password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
-            }
-        }
-    }
-    publications {
-        register<MavenPublication>("gpr") {
-            from(components["java"])
-        }
-    }
-}
+//publishing {
+//    repositories {
+//        maven {
+//            name = "GitHubPackages"
+//            url = uri("https://maven.pkg.github.com/target/native_memory_allocator")
+//            credentials {
+//                username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+//                password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+//            }
+//        }
+//    }
+//    publications {
+//        register<MavenPublication>("gpr") {
+//            from(components["java"])
+//        }
+//    }
+//}

examples/map/offheap-eviction-operationcounters/build.gradle.kts

@@ -1,11 +1,10 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
-    kotlin("jvm")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    kotlin("jvm") version libs.versions.kotlin.core
+    alias(libs.plugins.shadow)
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 
@@ -14,15 +13,13 @@ dependencies {
 }
 
 tasks {
-    named<ShadowJar>("shadowJar") {
+    shadowJar {
         archiveBaseName.set("offheap-eviction-operationcounters-shadowjar")
         manifest {
             attributes(mapOf("Main-Class" to "com.target.nativememoryallocator.examples.map.offheap.eviction.operationcounters.OffHeapEvictionOperationCountersKt"))
         }
     }
-}
 
-tasks {
     build {
         dependsOn(shadowJar)
     }

examples/map/offheap-eviction-operationcounters/src/main/kotlin/com/target/nativememoryallocator/examples/map/offheap.eviction.operationcounters/OffHeapEvictionOperationCounters.kt

@@ -6,8 +6,12 @@ import com.target.nativememoryallocator.examples.map.utils.CacheObjectSerializer
 import com.target.nativememoryallocator.examples.map.utils.buildRandomString
 import com.target.nativememoryallocator.map.NativeMemoryMapBackend
 import com.target.nativememoryallocator.map.NativeMemoryMapBuilder
-import kotlinx.coroutines.*
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlin.random.Random
 
 private val logger = KotlinLogging.logger {}

examples/map/offheap-eviction/build.gradle.kts

@@ -1,11 +1,10 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
-    kotlin("jvm")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    kotlin("jvm") version libs.versions.kotlin.core
+    alias(libs.plugins.shadow)
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 
@@ -14,15 +13,13 @@ dependencies {
 }
 
 tasks {
-    named<ShadowJar>("shadowJar") {
+    shadowJar {
         archiveBaseName.set("offheap-eviction-shadowjar")
         manifest {
             attributes(mapOf("Main-Class" to "com.target.nativememoryallocator.examples.map.offheap.eviction.OffHeapEvictionKt"))
         }
     }
-}
 
-tasks {
     build {
         dependsOn(shadowJar)
     }

examples/map/offheap-eviction/src/main/kotlin/com/target/nativememoryallocator/examples/map/offheap.eviction/OffHeapEviction.kt

@@ -6,8 +6,12 @@ import com.target.nativememoryallocator.examples.map.utils.CacheObjectSerializer
 import com.target.nativememoryallocator.examples.map.utils.buildRandomString
 import com.target.nativememoryallocator.map.NativeMemoryMapBackend
 import com.target.nativememoryallocator.map.NativeMemoryMapBuilder
-import kotlinx.coroutines.*
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlin.random.Random
 
 private val logger = KotlinLogging.logger {}