Skip to content

Commit 069ff73

Browse files
committed
Enable gradle samples
Signed-off-by: onobc <chris.bono@gmail.com>
1 parent 2969752 commit 069ff73

File tree

13 files changed

+33
-27
lines changed

13 files changed

+33
-27
lines changed

samples/grpc-oauth2/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ processTestAot {
2020
}
2121

2222
repositories {
23+
mavenLocal()
2324
mavenCentral()
2425
maven { url 'https://repo.spring.io/milestone' }
2526
maven { url 'https://repo.spring.io/snapshot' }

samples/grpc-reactive/build.gradle

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id 'java'
33
id 'org.springframework.boot' version '4.0.0-RC2'
44
id 'io.spring.dependency-management' version '1.1.7'
5-
id 'org.graalvm.buildtools.native' version '0.10.3'
65
id 'com.google.protobuf' version '0.9.4'
76
}
87

@@ -17,7 +16,8 @@ java {
1716

1817
repositories {
1918
mavenCentral()
20-
maven { url 'https://repo.spring.io/milestone' }
19+
mavenLocal()
20+
maven { url 'https://repo.spring.io/milestone' }
2121
maven { url 'https://repo.spring.io/snapshot' }
2222
}
2323

@@ -30,13 +30,14 @@ dependencyManagement {
3030
dependencies {
3131
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
3232
implementation 'org.springframework.boot:spring-boot-starter-actuator'
33-
implementation 'com.salesforce.servicelibs:reactor-grpc-stub:1.2.4'
3433
implementation 'io.projectreactor:reactor-core'
34+
implementation 'com.salesforce.servicelibs:reactor-grpc-stub:1.2.4'
3535

3636
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
3737

3838
testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
3939
testImplementation 'org.springframework.boot:spring-boot-starter-test'
40+
testImplementation 'io.grpc:grpc-inprocess'
4041
testImplementation 'io.projectreactor:reactor-test'
4142

4243
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -50,23 +51,23 @@ test {
5051
}
5152

5253
protobuf {
53-
protoc {
54-
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
55-
}
56-
plugins {
57-
grpc {
58-
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
59-
}
60-
reactor {
61-
artifact = "com.salesforce.servicelibs:reactor-grpc:1.2.4"
62-
}
63-
}
64-
generateProtoTasks {
65-
all()*.plugins {
66-
grpc {
67-
option '@generated=omit'
68-
}
69-
reactor {}
70-
}
71-
}
54+
protoc {
55+
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
56+
}
57+
plugins {
58+
grpc {
59+
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
60+
}
61+
reactor {
62+
artifact = "com.salesforce.servicelibs:reactor-grpc:1.2.4"
63+
}
64+
}
65+
generateProtoTasks {
66+
all()*.plugins {
67+
grpc {
68+
option '@generated=omit'
69+
}
70+
reactor {}
71+
}
72+
}
7273
}

samples/grpc-reactive/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<dependency>
6161
<groupId>com.salesforce.servicelibs</groupId>
6262
<artifactId>reactor-grpc-stub</artifactId>
63+
<version>1.2.4</version>
6364
</dependency>
6465
<dependency>
6566
<!-- the reactive plugin always generates javax annotations-->

samples/grpc-reactive/src/test/resources/application-ssl.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.
-2.21 KB
Binary file not shown.

samples/grpc-secure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ java {
1616
}
1717

1818
repositories {
19+
mavenLocal()
1920
mavenCentral()
2021
maven { url 'https://repo.spring.io/milestone' }
2122
maven { url 'https://repo.spring.io/snapshot' }

samples/grpc-server-kotlin/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ java {
1717
}
1818

1919
repositories {
20+
mavenLocal()
2021
mavenCentral()
2122
maven { url 'https://repo.spring.io/milestone' }
2223
maven { url 'https://repo.spring.io/snapshot' }

samples/grpc-server-netty-shaded/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ java {
1616
}
1717

1818
repositories {
19+
mavenLocal()
1920
mavenCentral()
2021
maven { url 'https://repo.spring.io/milestone' }
2122
maven { url 'https://repo.spring.io/snapshot' }

samples/grpc-server/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ java {
1616
}
1717

1818
repositories {
19+
mavenLocal()
1920
mavenCentral()
2021
maven { url 'https://repo.spring.io/milestone' }
2122
maven { url 'https://repo.spring.io/snapshot' }

samples/grpc-tomcat-secure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ java {
1616
}
1717

1818
repositories {
19+
mavenLocal()
1920
mavenCentral()
2021
maven { url 'https://repo.spring.io/milestone' }
2122
maven { url 'https://repo.spring.io/snapshot' }

0 commit comments

Comments
 (0)