Skip to content

modernize exampleKotlinDslProject #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sullis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modernize exampleKotlinDslProject #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions examples/exampleKotlinDslProject/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,18 @@ repositories {
mavenCentral()
}

testing {
suites {
named<JvmTestSuite>("test") {
useJUnitJupiter("6.0.2")
}
}
}

dependencies {
implementation("com.google.protobuf:protobuf-java:3.6.1")
implementation("io.grpc:grpc-stub:1.15.1")
implementation("io.grpc:grpc-protobuf:1.15.1")
implementation("com.google.protobuf:protobuf-java:4.33.4")
implementation("io.grpc:grpc-stub:1.78.0")
implementation("io.grpc:grpc-protobuf:1.78.0")

if (JavaVersion.current().isJava9Compatible()) {
// Workaround for @javax.annotation.Generated
Expand All @@ -26,7 +34,8 @@ dependencies {
protobuf(files("lib/protos.tar.gz"))
protobuf(files("ext/"))

testImplementation("junit:junit:4.12")
testImplementation("org.junit.jupiter:junit-jupiter-api:6.0.2")

// Extra proto source files for test besides the ones residing under
// "src/test".
testProtobuf(files("lib/protos-test.tar.gz"))
Expand All @@ -35,14 +44,14 @@ dependencies {
protobuf {
protoc {
// The artifact spec for the Protobuf Compiler
artifact = "com.google.protobuf:protoc:3.6.1"
artifact = "com.google.protobuf:protoc:4.33.4"
}
plugins {
// Optional: an artifact spec for a protoc plugin, with "grpc" as
// the identifier, which can be referred to in the "plugins"
// container of the "generateProtoTasks" closure.
id("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.15.1"
artifact = "io.grpc:protoc-gen-grpc-java:1.78.0"
}
}
generateProtoTasks {
Expand All @@ -57,3 +66,9 @@ protobuf {
}
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}
Binary file modified examples/exampleKotlinDslProject/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion examples/exampleKotlinDslProject/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading