-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* try to remove stub-lite for #234 * try to non-transitive grpc-stub * make grpc-stub transitive * upgrade info * tests need grpc-protobuf * always publish to maven local * fix links * to kts * doc cleanupp * plain console * add retry to arm tests * Update CHANGELOG.md Co-authored-by: Brent Shaffer <betterbrent@google.com> Co-authored-by: Brent Shaffer <betterbrent@google.com>
- Loading branch information
Showing
25 changed files
with
504 additions
and
606 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| ## Change Log | ||
|
|
||
| ### 1.1.0 | ||
|
|
||
| - The `grpc-kotlin-stub` library no longer depends on `grpc-protobuf` or `protobuf-java-util`, so your project will need | ||
| to include protobuf dependencies itself. For examples, see: | ||
| [examples/stub/build.gradle.kts](examples/stub/build.gradle.kts), | ||
| [examples/stub-lite/build.gradle.kts](examples/stub-lite/build.gradle.kts), or | ||
| [examples/stub-android/build.gradle.kts](examples/stub-android/build.gradle.kts) | ||
| - The `grpc-kotlin-stub-lite` library no longer exists, instead use `grpc-kotlin-stub`. | ||
| - `grpc-kotlin-stub` now exports the `javax.annotation:javax.annotation-api` dependency, so you can drop it from your | ||
| project's explicitly listed dependencies. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import org.gradle.api.tasks.testing.logging.TestExceptionFormat | ||
| import org.gradle.api.tasks.testing.logging.TestLogEvent | ||
| import org.jetbrains.kotlin.gradle.tasks.KotlinCompile | ||
| import org.jetbrains.kotlin.utils.addToStdlib.safeAs | ||
|
|
||
| plugins { | ||
| kotlin("jvm") version "1.3.72" apply false | ||
| id("com.google.protobuf") version "0.8.15" apply false | ||
| } | ||
|
|
||
| ext["grpcVersion"] = "1.36.0" // CURRENT_GRPC_VERSION | ||
| ext["protobufVersion"] = "3.14.0" | ||
| ext["kotlinVersion"] = "1.3.61" | ||
| ext["coroutinesVersion"] = "1.3.3" | ||
| ext["googleauthVersion"] = "0.20.0" | ||
|
|
||
| subprojects { | ||
|
|
||
| apply { | ||
| plugin("java") | ||
| plugin("org.jetbrains.kotlin.jvm") | ||
| plugin("com.google.protobuf") | ||
| plugin("maven-publish") | ||
| plugin("signing") | ||
| } | ||
|
|
||
| group = "io.grpc" | ||
| version = "1.1.0-SNAPSHOT" | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| tasks.withType<JavaCompile> { | ||
| sourceCompatibility = JavaVersion.VERSION_1_7.toString() | ||
| targetCompatibility = JavaVersion.VERSION_1_7.toString() | ||
| } | ||
|
|
||
| tasks.withType<KotlinCompile> { | ||
| kotlinOptions { | ||
| freeCompilerArgs = listOf("-Xjsr305=strict") | ||
| jvmTarget = JavaVersion.VERSION_1_6.toString() | ||
| } | ||
| } | ||
|
|
||
| tasks.withType<Test> { | ||
| testLogging { | ||
| showStandardStreams = true | ||
|
|
||
| // set options for log level LIFECYCLE | ||
| events = setOf( | ||
| TestLogEvent.FAILED, | ||
| TestLogEvent.PASSED, | ||
| TestLogEvent.SKIPPED, | ||
| TestLogEvent.STANDARD_OUT | ||
| ) | ||
|
|
||
| exceptionFormat = TestExceptionFormat.FULL | ||
| showExceptions = true | ||
| showCauses = true | ||
| showStackTraces = true | ||
|
|
||
| // set options for log level DEBUG and INFO | ||
| debug { | ||
| events = setOf( | ||
| TestLogEvent.STARTED, | ||
| TestLogEvent.FAILED, | ||
| TestLogEvent.PASSED, | ||
| TestLogEvent.SKIPPED, | ||
| TestLogEvent.STANDARD_ERROR, | ||
| TestLogEvent.STANDARD_OUT | ||
| ) | ||
|
|
||
| exceptionFormat = TestExceptionFormat.FULL | ||
| } | ||
|
|
||
| info.events = debug.events | ||
| info.exceptionFormat = debug.exceptionFormat | ||
| } | ||
|
|
||
| afterSuite( | ||
| KotlinClosure2({ desc: TestDescriptor, result: TestResult -> | ||
| if (desc.parent == null) { // will match the outermost suite | ||
| println("Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)") | ||
| } | ||
| }) | ||
| ) | ||
| } | ||
|
|
||
| extensions.getByType<PublishingExtension>().publications { | ||
| create<MavenPublication>("maven") { | ||
| pom { | ||
| url.set("https://github.com/grpc/grpc-kotlin") | ||
|
|
||
| scm { | ||
| connection.set("scm:git:https://github.com/grpc/grpc-kotlin.git") | ||
| developerConnection.set("scm:git:git@github.com:grpc/grpc-kotlin.git") | ||
| url.set("https://github.com/grpc/grpc-kotlin") | ||
| } | ||
|
|
||
| licenses { | ||
| license { | ||
| name.set("Apache 2.0") | ||
| url.set("https://opensource.org/licenses/Apache-2.0") | ||
| } | ||
| } | ||
|
|
||
| developers { | ||
| developer { | ||
| id.set("grpc.io") | ||
| name.set("gRPC Contributors") | ||
| email.set("grpc-io@googlegroups.com") | ||
| url.set("https://grpc.io/") | ||
| organization.set("gRPC Authors") | ||
| organizationUrl.set("https://www.google.com") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
| val snapshotUrl = uri("https://oss.sonatype.org/content/repositories/snapshots") | ||
| val releaseUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2") | ||
| url = if (version.safeAs<String>()?.endsWith("SNAPSHOT") == true) snapshotUrl else releaseUrl | ||
| credentials { | ||
| username = project.findProperty("sonatypeUsername")?.safeAs() ?: "" | ||
| password = project.findProperty("sonatypePassword")?.safeAs() ?: "" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extensions.getByType<SigningExtension>().sign(extensions.getByType<PublishingExtension>().publications.named("maven").get()) | ||
|
|
||
| tasks.withType<Sign> { | ||
| onlyIf { project.hasProperty("signing.keyId") } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.