Skip to content

Commit b07b541

Browse files
committed
Prefix artifacts with rsocket-rpc
1 parent 6412200 commit b07b541

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+246
-265
lines changed

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
#JS ignores
2-
node_modules/
3-
dist/
4-
prebuilds/
5-
61
# Created by https://www.gitignore.io/api/node,java,macos,linux,cmake,gradle,intellij+all
72

83
### CMake ###
@@ -249,5 +244,7 @@ gradle-app.setting
249244
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
250245
# gradle/wrapper/gradle-wrapper.properties
251246

247+
# Protobuf
248+
generated/
252249

253250
# End of https://www.gitignore.io/api/node,java,macos,linux,cmake,gradle,intellij+all

build.gradle

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,45 @@
11
buildscript {
22
repositories {
33
jcenter()
4-
mavenCentral()
54
}
65
dependencies {
76
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
8-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5'
97
}
108
}
119

1210
plugins {
1311
id 'com.gradle.build-scan' version '1.15.1' // declare before any other plugin
1412
id 'com.google.osdetector' version '1.4.0'
15-
id 'com.github.sherter.google-java-format' version '0.6' apply false
13+
id 'com.github.sherter.google-java-format' version '0.7.1' apply false
1614
id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
1715
id 'me.champeau.gradle.jmh' version '0.4.4' apply false
1816
id 'io.morethan.jmhreport' version '0.6.2.1' apply false
1917
}
2018

2119
buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
2220

23-
project(':core') {
21+
project(':rsocket-rpc-core') {
2422
description = 'RSocket RPC Library'
25-
ext.artifactName = 'core'
23+
ext.artifactName = 'rsocket-rpc-core'
2624

2725
apply from: file('../gradle/java.gradle')
2826
}
2927

30-
project(':core-idl') {
31-
description = 'RSocket RPC IDL'
32-
ext.artifactName = 'core-idl'
28+
project(':rsocket-rpc-metrics-idl') {
29+
description = 'RSocket RPC Metrics IDL'
30+
ext.artifactName = 'rsocket-rpc-metrics-idl'
3331

3432
apply from: file('../gradle/java.gradle')
3533
}
3634

37-
project(':frames') {
38-
description = 'RSocket RPC Frames'
39-
ext.artifactName = 'frames'
40-
41-
apply from: file('../gradle/java.gradle')
35+
project(':rsocket-rpc-protobuf') {
36+
description = 'RSocket RPC Protobuf Generator'
37+
ext.artifactName = 'rsocket-rpc-protobuf'
4238
}
4339

44-
project(':metrics-idl') {
45-
description = 'RSocket RPC Metrics IDL'
46-
ext.artifactName = 'metrics-idl'
40+
project(':rsocket-rpc-protobuf-idl') {
41+
description = 'RSocket RPC Protobf IDL'
42+
ext.artifactName = 'rsocket-rpc-protobuf-idl'
4743

4844
apply from: file('../gradle/java.gradle')
4945
}
50-
51-
project(':protobuf-rpc') {
52-
description = 'RSocket RPC Protobuf Generator'
53-
ext.artifactName = 'protobuf-rpc'
54-
55-
}

core-idl/src/main/proto/proteus/core.proto

Lines changed: 0 additions & 17 deletions
This file was deleted.

frames/build.gradle

Lines changed: 0 additions & 3 deletions
This file was deleted.

gradle/wrapper/gradle-wrapper.jar

-318 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

core/build.gradle renamed to rsocket-rpc-core/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
plugins {
2-
id 'com.google.protobuf'
2+
id 'com.google.protobuf' version '0.8.5'
33
}
44

55
sourceCompatibility = 1.8
66
targetCompatibility = 1.8
77

88
dependencies {
9-
compile project (':frames')
10-
compile project (':protobuf-rpc')
9+
compile project (':rsocket-rpc-protobuf')
1110
compile 'io.opentracing:opentracing-api:0.31.0'
1211
compile 'javax.inject:javax.inject:1'
1312
compile 'com.google.protobuf:protobuf-java:3.6.0'
1413
compile 'io.rsocket:rsocket-core:0.11.5'
1514
compile 'io.rsocket:rsocket-transport-netty:0.11.5'
1615
compile 'io.micrometer:micrometer-core:1.0.3'
1716

18-
protobuf project(':metrics-idl')
17+
protobuf project(':rsocket-rpc-metrics-idl')
1918

2019
testCompile 'io.opentracing.brave:brave-opentracing:0.31.2'
2120
testCompile 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.7.6'
2221
}
2322

2423

2524
def protocPluginBaseName = "rsocket-rpc-java-${osdetector.os}-${osdetector.arch}"
26-
def javaPluginPath = "$rootDir/protobuf-rpc/build/exe/java_plugin/$protocPluginBaseName"
25+
def javaPluginPath = "$rootDir/rsocket-rpc-protobuf/build/exe/java_plugin/$protocPluginBaseName"
2726

2827
protobuf {
2928
generatedFilesBaseDir = "${projectDir}/src/generated"
@@ -38,7 +37,7 @@ protobuf {
3837
}
3938
generateProtoTasks {
4039
all().each { task ->
41-
task.dependsOn ':protobuf-rpc:java_pluginExecutable'
40+
task.dependsOn ':rsocket-rpc-protobuf:java_pluginExecutable'
4241
// Recompile protos when the codegen has been changed
4342
task.inputs.file javaPluginPath
4443
// Recompile protos when build.gradle has been changed, because
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)