update gradle.build deps

keva-dev · Dec 11, 2021 · bb8e9d9 · bb8e9d9
1 parent 7bc0a04
commit bb8e9d9
Show file tree

Hide file tree

Showing 16 changed files with 114 additions and 31 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ repositories {
 }
 
 dependencies {
-    implementation project(':core')
-    implementation project(':config')
+    api project(':core')
+    api project(':config')
 
     implementation 'ch.qos.logback:logback-classic:1.2.7'
     implementation 'ch.qos.logback:logback-core:1.2.7'

diff --git a/core/build.gradle b/core/build.gradle
@@ -11,24 +11,27 @@ dependencies {
     implementation project(':protocol')
     implementation project(':store')
     implementation project(':config')
+    implementation project(':util')
 
-    implementation 'io.netty:netty-handler:4.1.70.Final'
-    implementation 'io.netty:netty-buffer:4.1.70.Final'
-    implementation 'io.netty:netty-transport-native-kqueue:4.1.70.Final:osx-x86_64'
-    implementation 'io.netty:netty-transport-native-epoll:4.1.70.Final:linux-x86_64'
+    api 'io.netty:netty-handler:4.1.70.Final'
+    api 'io.netty:netty-buffer:4.1.70.Final'
+    api 'io.netty:netty-transport-native-kqueue:4.1.70.Final:osx-x86_64'
+    api 'io.netty:netty-transport-native-epoll:4.1.70.Final:linux-x86_64'
 
-    implementation 'com.google.guava:guava:31.0.1-jre'
-    implementation 'org.reflections:reflections:0.10.2'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    api 'com.google.guava:guava:31.0.1-jre'
+    api 'org.reflections:reflections:0.10.2'
+    api 'org.apache.commons:commons-lang3:3.12.0'
 
-    implementation files('libs/keva-ioc-0.1.0-SNAPSHOT.jar')
+    api files('libs/keva-ioc-0.1.0-SNAPSHOT.jar')
 
     testImplementation 'redis.clients:jedis:3.7.0'
+}
 
-    // MTC lib depends on junit 4
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-    // noinspection GradlePackageUpdate
-    testRuntimeOnly('org.junit.vintage:junit-vintage-engine:5.7.2')
+jar {
+    project.configurations.api.canBeResolved = true
+    from {
+        configurations.api.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
 
 publishing {

diff --git a/core/src/main/java/dev/keva/core/aof/AOFManager.java b/core/src/main/java/dev/keva/core/aof/AOFManager.java
@@ -5,7 +5,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.Command;
-import dev.keva.protocol.resp.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesKey;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 

diff --git a/core/src/main/java/dev/keva/core/command/impl/transaction/Unwatch.java b/core/src/main/java/dev/keva/core/command/impl/transaction/Unwatch.java
@@ -5,7 +5,7 @@
 import dev.keva.core.command.impl.transaction.manager.TransactionManager;
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
-import dev.keva.protocol.resp.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesKey;
 import dev.keva.protocol.resp.reply.StatusReply;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.val;

diff --git a/core/src/main/java/dev/keva/core/command/impl/transaction/Watch.java b/core/src/main/java/dev/keva/core/command/impl/transaction/Watch.java
@@ -8,8 +8,8 @@
 import dev.keva.core.command.mapping.CommandMapper;
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
-import dev.keva.protocol.resp.hashbytes.BytesKey;
-import dev.keva.protocol.resp.hashbytes.BytesValue;
+import dev.keva.util.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesValue;
 import dev.keva.protocol.resp.reply.StatusReply;
 import dev.keva.store.KevaDatabase;
 import io.netty.channel.ChannelHandlerContext;

diff --git a/core/src/main/java/dev/keva/core/command/impl/transaction/manager/TransactionContext.java b/core/src/main/java/dev/keva/core/command/impl/transaction/manager/TransactionContext.java
@@ -2,8 +2,8 @@
 
 import dev.keva.core.command.mapping.CommandMapper;
 import dev.keva.protocol.resp.Command;
-import dev.keva.protocol.resp.hashbytes.BytesKey;
-import dev.keva.protocol.resp.hashbytes.BytesValue;
+import dev.keva.util.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesValue;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.protocol.resp.reply.Reply;
 import dev.keva.store.KevaDatabase;

diff --git a/core/src/main/java/dev/keva/core/command/mapping/CommandMapper.java b/core/src/main/java/dev/keva/core/command/mapping/CommandMapper.java
@@ -11,7 +11,7 @@
 import dev.keva.ioc.KevaIoC;
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
-import dev.keva.protocol.resp.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesKey;
 import dev.keva.protocol.resp.reply.ErrorReply;
 import dev.keva.protocol.resp.reply.Reply;
 import dev.keva.protocol.resp.reply.StatusReply;

diff --git a/core/src/main/java/dev/keva/core/server/NettyChannelHandler.java b/core/src/main/java/dev/keva/core/server/NettyChannelHandler.java
@@ -4,7 +4,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.Command;
-import dev.keva.protocol.resp.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesKey;
 import dev.keva.protocol.resp.reply.ErrorReply;
 import dev.keva.protocol.resp.reply.Reply;
 import io.netty.channel.ChannelHandler.Sharable;

diff --git a/protocol/build.gradle b/protocol/build.gradle
@@ -8,9 +8,9 @@ java {
 }
 
 dependencies {
+    implementation project(':util')
     implementation 'io.netty:netty-handler:4.1.70.Final'
     implementation 'io.netty:netty-buffer:4.1.70.Final'
-    implementation 'com.google.guava:guava:31.0.1-jre'
 }
 
 publishing {

diff --git a/settings.gradle b/settings.gradle
@@ -5,3 +5,4 @@ include 'core'
 include 'store'
 include 'protocol'
 include 'config'
+include 'util'
diff --git a/store/build.gradle b/store/build.gradle
@@ -9,8 +9,16 @@ java {
 
 dependencies {
     implementation project(':protocol')
-    implementation 'net.openhft:chronicle-map:3.21.86'
-    implementation 'org.apache.commons:commons-lang3:3.0'
+    implementation project(':util')
+    api 'net.openhft:chronicle-map:3.21.86'
+    api 'org.apache.commons:commons-lang3:3.12.0'
+}
+
+jar {
+    project.configurations.api.canBeResolved = true
+    from {
+        configurations.api.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
 
 javadoc {

diff --git a/store/src/main/java/dev/keva/store/impl/OffHeapDatabaseImpl.java b/store/src/main/java/dev/keva/store/impl/OffHeapDatabaseImpl.java
@@ -1,7 +1,7 @@
 package dev.keva.store.impl;
 
-import dev.keva.protocol.resp.hashbytes.BytesKey;
-import dev.keva.protocol.resp.hashbytes.BytesValue;
+import dev.keva.util.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesValue;
 import dev.keva.store.DatabaseConfig;
 import dev.keva.store.KevaDatabase;
 import dev.keva.store.lock.SpinLock;

diff --git a/store/src/main/java/dev/keva/store/impl/OnHeapDatabaseImpl.java b/store/src/main/java/dev/keva/store/impl/OnHeapDatabaseImpl.java
@@ -1,7 +1,7 @@
 package dev.keva.store.impl;
 
-import dev.keva.protocol.resp.hashbytes.BytesKey;
-import dev.keva.protocol.resp.hashbytes.BytesValue;
+import dev.keva.util.hashbytes.BytesKey;
+import dev.keva.util.hashbytes.BytesValue;
 import dev.keva.store.KevaDatabase;
 import dev.keva.store.lock.SpinLock;
 import lombok.Getter;

diff --git a/util/build.gradle b/util/build.gradle
@@ -0,0 +1,71 @@
+plugins {
+    id 'com.adarshr.test-logger' version '2.1.0'
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+dependencies {
+    implementation 'com.google.guava:guava:31.0.1-jre'
+}
+
+javadoc {
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = 'util'
+            from components.java
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
+            pom {
+                name = 'Keva Util'
+                description = 'Keva common utility'
+                url = 'https://keva.dev/'
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'https://github.com/keva-dev/keva/blob/master/LICENSE'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'tuhuynh27'
+                        name = 'Tu Huynh'
+                        email = '[email protected]'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:git://github.com/keva-dev/keva.git'
+                    developerConnection = 'scm:git:ssh://github.com:keva-dev/keva.git'
+                    url = 'https://github.com/keva-dev/keva'
+                }
+            }
+        }
+    }
+}
+
+signing {
+    sign publishing.publications.mavenJava
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+        outputs.upToDateWhen { false }
+        showStandardStreams = true
+    }
+}
diff --git a/...eva/protocol/resp/hashbytes/BytesKey.java → ...ava/dev/keva/util/hashbytes/BytesKey.java b/...eva/protocol/resp/hashbytes/BytesKey.java → ...ava/dev/keva/util/hashbytes/BytesKey.java
@@ -1,4 +1,4 @@
-package dev.keva.protocol.resp.hashbytes;
+package dev.keva.util.hashbytes;
 
 import com.google.common.primitives.SignedBytes;
 

diff --git a/...a/protocol/resp/hashbytes/BytesValue.java → ...a/dev/keva/util/hashbytes/BytesValue.java b/...a/protocol/resp/hashbytes/BytesValue.java → ...a/dev/keva/util/hashbytes/BytesValue.java
@@ -1,4 +1,4 @@
-package dev.keva.protocol.resp.hashbytes;
+package dev.keva.util.hashbytes;
 
 import java.io.Serializable;