fix build

robertroeser · robertroeser · commit 50393c27ec4d · 2018-06-18T23:27:21.000-07:00
diff --git a/broker-info-idl/build.gradle b/broker-info-idl/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    protobuf project (':protobuf-rpc')
+    protobuf project (':core-idl')
 
     compile 'com.google.protobuf:protobuf-java:3.5.0'
 }
diff --git a/broker-mgmt-idl/build.gradle b/broker-mgmt-idl/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    protobuf project (':protobuf-rpc')
+    protobuf project (':core-idl')
     protobuf project (':broker-info-idl')
 
     compile 'com.google.protobuf:protobuf-java:3.5.0'
diff --git a/build.gradle b/build.gradle
@@ -59,6 +59,14 @@ project(':core') {
     apply from: file('../gradle/java.gradle')
 }
 
+project(':core-idl') {
+    description = 'Netifi Core Library'
+    ext.artifactName = 'core-idl'
+
+    apply from: file('../gradle/release.gradle')
+    apply from: file('../gradle/java.gradle')
+}
+
 project(':frames') {
     description = 'Netifi Proteus Frames'
     ext.artifactName = 'frames'
diff --git a/client/build.gradle b/client/build.gradle
@@ -6,7 +6,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    protobuf project (':protobuf-rpc')
+    protobuf project (':core-idl')
     protobuf project (':broker-info-idl')
 
     compile project (':core')
diff --git a/core-idl/build.gradle b/core-idl/build.gradle
@@ -0,0 +1,8 @@
+plugins {
+    id 'com.google.protobuf' version '0.8.5'
+}
+
+dependencies {
+    compile 'com.google.protobuf:protobuf-java:3.5.0'
+    compile 'com.google.protobuf:protobuf-java-util:3.5.0'
+}
diff --git a/core-idl/src/main/proto/proteus/core.proto b/core-idl/src/main/proto/proteus/core.proto
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=0.7.3
+version=0.7.11
diff --git a/protobuf-rpc/build.gradle b/protobuf-rpc/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     compileOnly 'com.google.protobuf:protobuf-java-util:3.5.0'
 
     testCompile project(':core')
+    testProtobuf project (':core-idl')
     testCompile 'junit:junit:4.12'
 }
 
diff --git a/settings.gradle b/settings.gradle
@@ -5,6 +5,7 @@ include 'broker-info-idl'
 include 'broker-mgmt-idl'
 include 'client'
 include 'core'
+include 'core-idl'
 include 'frames'
 include 'metrics-idl'
 include 'protobuf-rpc'

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- protobuf project (':protobuf-rpc')`
	`6`	`+ protobuf project (':core-idl')`
`7`	`7`
`8`	`8`	`compile 'com.google.protobuf:protobuf-java:3.5.0'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`group=io.netifi.proteus`
`2`		`-version=0.7.3`
	`2`	`+version=0.7.11`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ dependencies {`
`23`	`23`	`compileOnly 'com.google.protobuf:protobuf-java-util:3.5.0'`
`24`	`24`
`25`	`25`	`testCompile project(':core')`
	`26`	`+ testProtobuf project (':core-idl')`
`26`	`27`	`testCompile 'junit:junit:4.12'`
`27`	`28`	`}`
`28`	`29`