Skip to content

Commit 89d6dd9

Browse files
tuhuynh27tuhuynh27
committed
update gradle.build deps
1 parent 7bc0a04 commit 89d6dd9

File tree

17 files changed

+68
-119
lines changed

17 files changed

+68
-119
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ repositories {
1212
}
1313

1414
dependencies {
15-
implementation project(':core')
16-
implementation project(':config')
15+
api project(':core')
16+
api project(':config')
1717

1818
implementation 'ch.qos.logback:logback-classic:1.2.7'
1919
implementation 'ch.qos.logback:logback-core:1.2.7'

‎config/build.gradle

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,6 @@ javadoc {
1616
}
1717
}
1818

19-
publishing {
20-
publications {
21-
mavenJava(MavenPublication) {
22-
artifactId = 'config-loader'
23-
from components.java
24-
versionMapping {
25-
usage('java-api') {
26-
fromResolutionOf('runtimeClasspath')
27-
}
28-
usage('java-runtime') {
29-
fromResolutionResult()
30-
}
31-
}
32-
pom {
33-
name = 'Keva ConfigLoader'
34-
description = 'Keva ConfigLoader utility'
35-
url = 'https://keva.dev/'
36-
licenses {
37-
license {
38-
name = 'The Apache License, Version 2.0'
39-
url = 'https://github.com/keva-dev/keva/blob/master/LICENSE'
40-
}
41-
}
42-
developers {
43-
developer {
44-
id = 'tuhuynh27'
45-
name = 'Tu Huynh'
46-
email = '[email protected]'
47-
}
48-
}
49-
scm {
50-
connection = 'scm:git:git://github.com/keva-dev/keva.git'
51-
developerConnection = 'scm:git:ssh://github.com:keva-dev/keva.git'
52-
url = 'https://github.com/keva-dev/keva'
53-
}
54-
}
55-
}
56-
}
57-
}
58-
59-
signing {
60-
sign publishing.publications.mavenJava
61-
}
62-
6319
test {
6420
useJUnitPlatform()
6521
testLogging {

‎core/build.gradle

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ plugins {
22
id 'com.adarshr.test-logger' version '2.1.0'
33
}
44

5+
evaluationDependsOn(':util')
6+
57
java {
68
withJavadocJar()
79
withSourcesJar()
810
}
911

1012
dependencies {
13+
implementation project(':util')
14+
implementation project(':config')
1115
implementation project(':protocol')
1216
implementation project(':store')
13-
implementation project(':config')
1417

1518
implementation 'io.netty:netty-handler:4.1.70.Final'
1619
implementation 'io.netty:netty-buffer:4.1.70.Final'
@@ -24,17 +27,23 @@ dependencies {
2427
implementation files('libs/keva-ioc-0.1.0-SNAPSHOT.jar')
2528

2629
testImplementation 'redis.clients:jedis:3.7.0'
30+
}
2731

28-
// MTC lib depends on junit 4
29-
testImplementation group: 'junit', name: 'junit', version: '4.12'
30-
// noinspection GradlePackageUpdate
31-
testRuntimeOnly('org.junit.vintage:junit-vintage-engine:5.7.2')
32+
jar {
33+
dependsOn(':util:build')
34+
dependsOn(':config:build')
35+
dependsOn(':protocol:build')
36+
dependsOn(':store:build')
37+
project.configurations.implementation.canBeResolved = true
38+
from {
39+
configurations.implementation.collect { it.isDirectory() ? it : zipTree(it) }
40+
}
3241
}
3342

3443
publishing {
3544
publications {
3645
mavenJava(MavenPublication) {
37-
artifactId = 'core'
46+
artifactId = 'kevadb'
3847
from components.java
3948
versionMapping {
4049
usage('java-api') {
@@ -45,8 +54,8 @@ publishing {
4554
}
4655
}
4756
pom {
48-
name = 'Keva Core'
49-
description = 'KevaDB Core'
57+
name = 'KevaDB'
58+
description = 'KevaDB - Low-latency in-memory key-value store, Redis drop-in alternative'
5059
url = 'https://keva.dev/'
5160
licenses {
5261
license {

‎core/src/main/java/dev/keva/core/aof/AOFManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import dev.keva.ioc.annotation.Autowired;
66
import dev.keva.ioc.annotation.Component;
77
import dev.keva.protocol.resp.Command;
8-
import dev.keva.protocol.resp.hashbytes.BytesKey;
8+
import dev.keva.util.hashbytes.BytesKey;
99
import lombok.extern.slf4j.Slf4j;
1010
import lombok.val;
1111

‎core/src/main/java/dev/keva/core/command/impl/transaction/Unwatch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import dev.keva.core.command.impl.transaction.manager.TransactionManager;
66
import dev.keva.ioc.annotation.Autowired;
77
import dev.keva.ioc.annotation.Component;
8-
import dev.keva.protocol.resp.hashbytes.BytesKey;
8+
import dev.keva.util.hashbytes.BytesKey;
99
import dev.keva.protocol.resp.reply.StatusReply;
1010
import io.netty.channel.ChannelHandlerContext;
1111
import lombok.val;

‎core/src/main/java/dev/keva/core/command/impl/transaction/Watch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import dev.keva.core.command.mapping.CommandMapper;
99
import dev.keva.ioc.annotation.Autowired;
1010
import dev.keva.ioc.annotation.Component;
11-
import dev.keva.protocol.resp.hashbytes.BytesKey;
12-
import dev.keva.protocol.resp.hashbytes.BytesValue;
11+
import dev.keva.util.hashbytes.BytesKey;
12+
import dev.keva.util.hashbytes.BytesValue;
1313
import dev.keva.protocol.resp.reply.StatusReply;
1414
import dev.keva.store.KevaDatabase;
1515
import io.netty.channel.ChannelHandlerContext;

‎core/src/main/java/dev/keva/core/command/impl/transaction/manager/TransactionContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import dev.keva.core.command.mapping.CommandMapper;
44
import dev.keva.protocol.resp.Command;
5-
import dev.keva.protocol.resp.hashbytes.BytesKey;
6-
import dev.keva.protocol.resp.hashbytes.BytesValue;
5+
import dev.keva.util.hashbytes.BytesKey;
6+
import dev.keva.util.hashbytes.BytesValue;
77
import dev.keva.protocol.resp.reply.MultiBulkReply;
88
import dev.keva.protocol.resp.reply.Reply;
99
import dev.keva.store.KevaDatabase;

‎core/src/main/java/dev/keva/core/command/mapping/CommandMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import dev.keva.ioc.KevaIoC;
1212
import dev.keva.ioc.annotation.Autowired;
1313
import dev.keva.ioc.annotation.Component;
14-
import dev.keva.protocol.resp.hashbytes.BytesKey;
14+
import dev.keva.util.hashbytes.BytesKey;
1515
import dev.keva.protocol.resp.reply.ErrorReply;
1616
import dev.keva.protocol.resp.reply.Reply;
1717
import dev.keva.protocol.resp.reply.StatusReply;

‎core/src/main/java/dev/keva/core/server/NettyChannelHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import dev.keva.ioc.annotation.Autowired;
55
import dev.keva.ioc.annotation.Component;
66
import dev.keva.protocol.resp.Command;
7-
import dev.keva.protocol.resp.hashbytes.BytesKey;
7+
import dev.keva.util.hashbytes.BytesKey;
88
import dev.keva.protocol.resp.reply.ErrorReply;
99
import dev.keva.protocol.resp.reply.Reply;
1010
import io.netty.channel.ChannelHandler.Sharable;

‎protocol/build.gradle

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,9 @@ java {
88
}
99

1010
dependencies {
11+
implementation project(':util')
1112
implementation 'io.netty:netty-handler:4.1.70.Final'
1213
implementation 'io.netty:netty-buffer:4.1.70.Final'
13-
implementation 'com.google.guava:guava:31.0.1-jre'
14-
}
15-
16-
publishing {
17-
publications {
18-
mavenJava(MavenPublication) {
19-
artifactId = 'protocol-resp'
20-
from components.java
21-
versionMapping {
22-
usage('java-api') {
23-
fromResolutionOf('runtimeClasspath')
24-
}
25-
usage('java-runtime') {
26-
fromResolutionResult()
27-
}
28-
}
29-
pom {
30-
name = 'Keva RESP Protocol'
31-
description = 'Keva RESP Protocol for Netty'
32-
url = 'https://keva.dev/'
33-
licenses {
34-
license {
35-
name = 'The Apache License, Version 2.0'
36-
url = 'https://github.com/keva-dev/keva/blob/master/LICENSE'
37-
}
38-
}
39-
developers {
40-
developer {
41-
id = 'tuhuynh27'
42-
name = 'Tu Huynh'
43-
email = '[email protected]'
44-
}
45-
}
46-
scm {
47-
connection = 'scm:git:git://github.com/keva-dev/keva.git'
48-
developerConnection = 'scm:git:ssh://github.com:keva-dev/keva.git'
49-
url = 'https://github.com/keva-dev/keva'
50-
}
51-
}
52-
}
53-
}
5414
}
5515

5616
javadoc {
@@ -59,10 +19,6 @@ javadoc {
5919
}
6020
}
6121

62-
signing {
63-
sign publishing.publications.mavenJava
64-
}
65-
6622
test {
6723
useJUnitPlatform()
6824
testLogging {

‎settings.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
rootProject.name = 'keva'
22

3-
include 'app'
4-
include 'core'
5-
include 'store'
6-
include 'protocol'
3+
include 'util'
74
include 'config'
5+
include 'protocol'
6+
include 'store'
7+
include 'core'
8+
include 'app'

‎store/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ java {
88
}
99

1010
dependencies {
11-
implementation project(':protocol')
11+
implementation project(':util')
1212
implementation 'net.openhft:chronicle-map:3.21.86'
13-
implementation 'org.apache.commons:commons-lang3:3.0'
13+
implementation 'org.apache.commons:commons-lang3:3.12.0'
1414
}
1515

1616
javadoc {

‎store/src/main/java/dev/keva/store/impl/OffHeapDatabaseImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.keva.store.impl;
22

3-
import dev.keva.protocol.resp.hashbytes.BytesKey;
4-
import dev.keva.protocol.resp.hashbytes.BytesValue;
3+
import dev.keva.util.hashbytes.BytesKey;
4+
import dev.keva.util.hashbytes.BytesValue;
55
import dev.keva.store.DatabaseConfig;
66
import dev.keva.store.KevaDatabase;
77
import dev.keva.store.lock.SpinLock;

‎store/src/main/java/dev/keva/store/impl/OnHeapDatabaseImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.keva.store.impl;
22

3-
import dev.keva.protocol.resp.hashbytes.BytesKey;
4-
import dev.keva.protocol.resp.hashbytes.BytesValue;
3+
import dev.keva.util.hashbytes.BytesKey;
4+
import dev.keva.util.hashbytes.BytesValue;
55
import dev.keva.store.KevaDatabase;
66
import dev.keva.store.lock.SpinLock;
77
import lombok.Getter;

‎util/build.gradle

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
plugins {
2+
id 'com.adarshr.test-logger' version '2.1.0'
3+
}
4+
5+
java {
6+
withJavadocJar()
7+
withSourcesJar()
8+
}
9+
10+
dependencies {
11+
implementation 'com.google.guava:guava:31.0.1-jre'
12+
}
13+
14+
javadoc {
15+
if (JavaVersion.current().isJava9Compatible()) {
16+
options.addBooleanOption('html5', true)
17+
}
18+
}
19+
20+
test {
21+
useJUnitPlatform()
22+
testLogging {
23+
events "passed", "skipped", "failed"
24+
outputs.upToDateWhen { false }
25+
showStandardStreams = true
26+
}
27+
}

‎protocol/src/main/java/dev/keva/protocol/resp/hashbytes/BytesKey.java renamed to ‎util/src/main/java/dev/keva/util/hashbytes/BytesKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.keva.protocol.resp.hashbytes;
1+
package dev.keva.util.hashbytes;
22

33
import com.google.common.primitives.SignedBytes;
44

‎protocol/src/main/java/dev/keva/protocol/resp/hashbytes/BytesValue.java renamed to ‎util/src/main/java/dev/keva/util/hashbytes/BytesValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.keva.protocol.resp.hashbytes;
1+
package dev.keva.util.hashbytes;
22

33
import java.io.Serializable;
44

0 commit comments

Comments
 (0)