Skip to content

Commit

Permalink
Replace buf.build with connectrpc.com (#79)
Browse files Browse the repository at this point in the history
- Update packages build.buf -> com.connectrpc
- Update Eliza usage
- Update buf.build -> connectrpc.com
- Update github references from bufbuild/connect-kotlin to
connectrpc/connect-kotlin
  • Loading branch information
smallsamantha authored Sep 14, 2023
1 parent c531c61 commit 5633710
Show file tree
Hide file tree
Showing 88 changed files with 457 additions and 457 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ you to accept the CLA when you open your pull request.
```
git clone [email protected]:your_github_username/connect-kotlin.git
cd connect-kotlin
git remote add upstream https://github.com/bufbuild/connect-kotlin.git
git remote add upstream https://github.com/connectrpc/connect-kotlin.git
git fetch upstream
```

Expand Down Expand Up @@ -58,7 +58,7 @@ We're much more likely to approve your changes if you:
* Write a [good commit message][commit-message].
* Maintain backward compatibility.

[fork]: https://github.com/bufbuild/connect-kotlin/fork
[open-issue]: https://github.com/bufbuild/connect-kotlin/issues/new
[fork]: https://github.com/connectrpc/connect-kotlin/fork
[open-issue]: https://github.com/connectrpc/connect-kotlin/issues/new
[cla]: https://cla-assistant.io/bufbuild/connect-kotlin
[commit-message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
**Before submitting your PR:** Please read through the contribution guide at https://github.com/bufbuild/connect-kotlin/blob/main/.github/CONTRIBUTING.md
**Before submitting your PR:** Please read through the contribution guide at https://github.com/connectrpc/connect-kotlin/blob/main/.github/CONTRIBUTING.md
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ generateconformance: $(PROTOC) buildplugin ## Generate protofiles for conformanc

.PHONY: generateexamples
generateexamples: $(PROTOC) buildplugin ## Generate proto files for example apps.
buf generate --template examples/buf.gen.yaml -o examples buf.build/bufbuild/eliza
buf generate --template examples/buf.gen.yaml -o examples buf.build/connectrpc/eliza

.PHONY: help
help: ## Describe useful make targets.
Expand Down
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Build](https://github.com/bufbuild/connect-kotlin/actions/workflows/ci.yml/badge.svg)
![Build](https://github.com/connectrpc/connect-kotlin/actions/workflows/ci.yml/badge.svg)
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

Connect-Kotlin
Expand All @@ -23,29 +23,29 @@ public class ElizaServiceClient(
request,
headers,
MethodSpec(
"buf.connect.demo.eliza.v1.ElizaService/Say",
buf.connect.demo.eliza.v1.SayRequest::class,
buf.connect.demo.eliza.v1.SayResponse::class
"connectrpc.eliza.v1.ElizaService/Say",
com.connectrpc.eliza.v1.SayRequest::class,
com.connectrpc.eliza.v1.SayResponse::class
)
)

public override suspend fun converse(headers: Headers):
BidirectionalStreamInterface<ConverseRequest, ConverseResponse> = client.stream(
headers,
MethodSpec(
"buf.connect.demo.eliza.v1.ElizaService/Converse",
buf.connect.demo.eliza.v1.ConverseRequest::class,
buf.connect.demo.eliza.v1.ConverseResponse::class
"connectrpc.eliza.v1.ElizaService/Converse",
com.connectrpc.eliza.v1.ConverseRequest::class,
com.connectrpc.eliza.v1.ConverseResponse::class
)
)

public override suspend fun introduce(headers: Headers):
ServerOnlyStreamInterface<IntroduceRequest, IntroduceResponse> = client.serverStream(
headers,
MethodSpec(
"buf.connect.demo.eliza.v1.ElizaService/Introduce",
buf.connect.demo.eliza.v1.IntroduceRequest::class,
buf.connect.demo.eliza.v1.IntroduceResponse::class
"connectrpc.eliza.v1.ElizaService/Introduce",
com.connectrpc.eliza.v1.IntroduceRequest::class,
com.connectrpc.eliza.v1.IntroduceResponse::class
)
)
}
Expand Down Expand Up @@ -100,7 +100,7 @@ It only takes ~10 minutes to complete a working chat app that uses Connect-Kotli

Comprehensive documentation for everything, including
[interceptors][interceptors], [streaming][streaming], and [error handling][error-handling]
is available on the [connect.build website][getting-started].
is available on the [connectrpc.com website][getting-started].

## Generation Options

Expand Down Expand Up @@ -162,17 +162,17 @@ Offered under the [Apache 2 license][license].
[buf-studio]: https://buf.build/studio
[conformance]: https://github.com/connectrpc/conformance
[connect-go]: https://github.com/connectrpc/connect-go
[connect-protocol]: https://connect.build/docs/protocol
[connect-protocol]: https://connectrpc.com/docs/protocol
[connect-swift]: https://github.com/bufbuild/connect-swift
[connect-es]: https://github.com/connectrpc/connect-es
[error-handling]: https://connect.build/docs/kotlin/errors
[getting-started]: https://connect.build/docs/kotlin/getting-started
[connect-es]: https://www.npmjs.com/package/@connectrpc/connect
[error-handling]: https://connectrpc.com/docs/kotlin/errors
[getting-started]: https://connectrpc.com/docs/kotlin/getting-started
[grpc-protocol]: https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md
[grpc-web-protocol]: https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-WEB.md
[interceptors]: https://connect.build/docs/kotlin/interceptors
[license]: https://github.com/bufbuild/connect-go/blob/main/LICENSE
[interceptors]: https://connectrpc.com/docs/kotlin/interceptors
[license]: https://github.com/connectrpc/connect-kotlin/blob/main/LICENSE
[protobuf]: https://developers.google.com/protocol-buffers
[protocol]: https://connect.build/docs/protocol
[server reflection]: https://github.com/bufbuild/connect-grpcreflect-go
[protocol]: https://connectrpc.com/docs/protocol
[server reflection]: https://github.com/connectrpc/grpcreflect-go
[slack]: https://buf.build/links/slack
[streaming]: https://connect.build/docs/kotlin/using-clients#using-generated-clients
[streaming]: https://connectrpc.com/docs/kotlin/using-clients#using-generated-clients
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ allprojects {
pom {
description.set("Simple, reliable, interoperable. A better RPC.")
name.set("connect-library") // This is overwritten in subprojects.
group = "build.buf"
url.set("https://github.com/bufbuild/connect-kotlin")
group = "com.connectrpc"
url.set("https://github.com/connectrpc/connect-kotlin")
licenses {
license {
name.set("The Apache Software License, Version 2.0")
Expand All @@ -101,9 +101,9 @@ allprojects {
}
}
scm {
url.set("https://github.com/bufbuild/connect-kotlin")
connection.set("scm:git:https://github.com/bufbuild/connect-kotlin.git")
developerConnection.set("scm:git:ssh://[email protected]/bufbuild/connect-kotlin.git")
url.set("https://github.com/connectrpc/connect-kotlin")
connection.set("scm:git:https://github.com/connectrpc/connect-kotlin.git")
developerConnection.set("scm:git:ssh://[email protected]/connectrpc/connect-kotlin.git")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@

package com.connectrpc.conformance

import build.buf.connect.Code
import build.buf.connect.ProtocolClientConfig
import build.buf.connect.RequestCompression
import build.buf.connect.compression.GzipCompressionPool
import build.buf.connect.extensions.GoogleJavaProtobufStrategy
import build.buf.connect.impl.ProtocolClient
import build.buf.connect.okhttp.ConnectOkHttpClient
import build.buf.connect.protocols.NetworkProtocol
import com.connectrpc.Code
import com.connectrpc.ProtocolClientConfig
import com.connectrpc.RequestCompression
import com.connectrpc.compression.GzipCompressionPool
import com.connectrpc.conformance.ssl.sslContext
import com.connectrpc.conformance.v1.ErrorDetail
import com.connectrpc.conformance.v1.TestServiceClient
Expand All @@ -32,6 +28,10 @@ import com.connectrpc.conformance.v1.payload
import com.connectrpc.conformance.v1.responseParameters
import com.connectrpc.conformance.v1.simpleRequest
import com.connectrpc.conformance.v1.streamingOutputCallRequest
import com.connectrpc.extensions.GoogleJavaProtobufStrategy
import com.connectrpc.impl.ProtocolClient
import com.connectrpc.okhttp.ConnectOkHttpClient
import com.connectrpc.protocols.NetworkProtocol
import com.google.protobuf.ByteString
import com.google.protobuf.Empty
import kotlinx.coroutines.Dispatchers
Expand Down
6 changes: 3 additions & 3 deletions examples/android/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Eliza chat app example

This example app uses the `Connect` library and provides an interface for
[chatting with Eliza](https://buf.build/bufbuild/eliza) via an Android application.
[chatting with Eliza](https://buf.build/connectrpc/eliza) via an Android application.

The app has support for chatting using a variety of protocols supported by
the Connect-Kotlin library:

- [Connect](https://connect.build) + unary
- [Connect](https://connect.build) + streaming
- [Connect](https://connectrpc.com) + unary
- [Connect](https://connectrpc.com) + streaming
- [gRPC](https://grpc.io) + unary
- [gRPC](https://grpc.io) + streaming
- [gRPC-Web](https://grpc.io) + unary
Expand Down
4 changes: 2 additions & 2 deletions examples/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
compileSdk = 32

defaultConfig {
applicationId = "build.buf.connect.examples.android"
applicationId = "com.connectrpc.examples.android"
minSdk = 28
targetSdk = 32
versionCode = 1
Expand All @@ -19,7 +19,7 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
namespace = "build.buf.connect.examples.android"
namespace = "com.connectrpc.examples.android"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.examples.android
package com.connectrpc.examples.android

import android.os.Bundle
import android.widget.Button
Expand All @@ -21,14 +21,14 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.RecyclerView
import build.buf.connect.ProtocolClientConfig
import build.buf.connect.demo.eliza.v1.ConverseRequest
import build.buf.connect.demo.eliza.v1.ElizaServiceClient
import build.buf.connect.demo.eliza.v1.SayRequest
import build.buf.connect.extensions.GoogleJavaLiteProtobufStrategy
import build.buf.connect.impl.ProtocolClient
import build.buf.connect.okhttp.ConnectOkHttpClient
import build.buf.connect.protocols.NetworkProtocol
import com.connectrpc.ProtocolClientConfig
import com.connectrpc.eliza.v1.ConverseRequest
import com.connectrpc.eliza.v1.ElizaServiceClient
import com.connectrpc.eliza.v1.SayRequest
import com.connectrpc.extensions.GoogleJavaLiteProtobufStrategy
import com.connectrpc.impl.ProtocolClient
import com.connectrpc.okhttp.ConnectOkHttpClient
import com.connectrpc.protocols.NetworkProtocol
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import okhttp3.OkHttpClient
Expand Down Expand Up @@ -60,7 +60,7 @@ class ElizaChatActivity : AppCompatActivity() {
.writeTimeout(10, TimeUnit.MINUTES)
.callTimeout(10, TimeUnit.MINUTES)
.build()
val host = "https://demo.connect.build"
val host = "https://demo.connectrpc.com"
val protocol = intent.getStringExtra(PROTOCOL_KEY)
// Get the user selected protocol.
val selectedNetworkProtocolOption = when (protocol) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.examples.android
package com.connectrpc.examples.android

import android.content.Intent
import android.os.Bundle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.examples.android
package com.connectrpc.examples.android

import android.view.Gravity
import android.view.LayoutInflater
Expand Down
2 changes: 1 addition & 1 deletion examples/buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: v1
managed:
enabled: true
java_package_prefix: "build"
java_package_prefix: "com"
plugins:
- plugin: connect-kotlin
out: generated-google-java/build/generated/sources/bufgen
Expand Down
2 changes: 1 addition & 1 deletion examples/kotlin-google-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

application {
mainClass.set("build.buf.connect.examples.kotlin.Main")
mainClass.set("com.connectrpc.examples.kotlin.Main")
}

tasks {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.examples.kotlin
package com.connectrpc.examples.kotlin

import build.buf.connect.ProtocolClientConfig
import build.buf.connect.demo.eliza.v1.ConverseRequest
import build.buf.connect.demo.eliza.v1.ElizaServiceClient
import build.buf.connect.extensions.GoogleJavaProtobufStrategy
import build.buf.connect.impl.ProtocolClient
import build.buf.connect.okhttp.ConnectOkHttpClient
import com.connectrpc.ProtocolClientConfig
import com.connectrpc.eliza.v1.ConverseRequest
import com.connectrpc.eliza.v1.ElizaServiceClient
import com.connectrpc.extensions.GoogleJavaProtobufStrategy
import com.connectrpc.impl.ProtocolClient
import com.connectrpc.okhttp.ConnectOkHttpClient
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
Expand All @@ -32,7 +32,7 @@ class Main {
@JvmStatic
fun main(args: Array<String>) {
runBlocking {
val host = "https://demo.connect.build"
val host = "https://demo.connectrpc.com"
val client = ProtocolClient(
httpClient = ConnectOkHttpClient(
OkHttpClient()
Expand Down
2 changes: 1 addition & 1 deletion examples/kotlin-google-javalite/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

application {
mainClass.set("build.buf.connect.examples.kotlin.Main")
mainClass.set("com.connectrpc.examples.kotlin.Main")
}

tasks {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.examples.kotlin
package com.connectrpc.examples.kotlin

import build.buf.connect.ProtocolClientConfig
import build.buf.connect.demo.eliza.v1.ConverseRequest
import build.buf.connect.demo.eliza.v1.ElizaServiceClient
import build.buf.connect.extensions.GoogleJavaLiteProtobufStrategy
import build.buf.connect.impl.ProtocolClient
import build.buf.connect.okhttp.ConnectOkHttpClient
import com.connectrpc.ProtocolClientConfig
import com.connectrpc.eliza.v1.ConverseRequest
import com.connectrpc.eliza.v1.ElizaServiceClient
import com.connectrpc.extensions.GoogleJavaLiteProtobufStrategy
import com.connectrpc.impl.ProtocolClient
import com.connectrpc.okhttp.ConnectOkHttpClient
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
Expand All @@ -32,7 +32,7 @@ class Main {
@JvmStatic
fun main(args: Array<String>) {
runBlocking {
val host = "https://demo.connect.build"
val host = "https://demo.connectrpc.com"
val client = ProtocolClient(
httpClient = ConnectOkHttpClient(
OkHttpClient()
Expand Down
2 changes: 1 addition & 1 deletion extensions/buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: v1
managed:
enabled: true
java_package_prefix: "build.buf"
java_package_prefix: "com.connectrpc"
types:
include:
- google.rpc.Status
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.extensions
package com.connectrpc.extensions

import build.buf.connect.Codec
import build.buf.connect.codecNameJSON
import com.connectrpc.Codec
import com.connectrpc.codecNameJSON
import com.google.protobuf.GeneratedMessageV3
import com.google.protobuf.Internal
import com.google.protobuf.util.JsonFormat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package build.buf.connect.extensions
package com.connectrpc.extensions

import build.buf.connect.Codec
import build.buf.connect.ErrorDetailParser
import build.buf.connect.SerializationStrategy
import build.buf.connect.codecNameJSON
import com.connectrpc.Codec
import com.connectrpc.ErrorDetailParser
import com.connectrpc.SerializationStrategy
import com.connectrpc.codecNameJSON
import com.google.protobuf.GeneratedMessageV3
import kotlin.reflect.KClass

Expand Down
Loading

0 comments on commit 5633710

Please sign in to comment.