Skip to content
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

rpc for android #1

Merged
merged 11 commits into from
Feb 11, 2021
Merged

rpc for android #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6c72e52
rpc for android
jbpratt Feb 10, 2021
f35e684
reorganize dir structure
jbpratt Feb 10, 2021
52dd04b
bump java version to 15
jbpratt Feb 10, 2021
ed975fb
only run ci and cd when needed
jbpratt Feb 10, 2021
058d775
fix name to protobuf
jbpratt Feb 10, 2021
2960f0b
s/gg/org
jbpratt Feb 10, 2021
4c53675
go mod tidy
jbpratt Feb 10, 2021
09ad810
gitattributes for rpc code
jbpratt Feb 10, 2021
cc75d13
add gitattributes and ensure test code is deleted
jbpratt Feb 10, 2021
4946bdb
swap to org package name
jbpratt Feb 10, 2021
b9b669b
rename
jbpratt Feb 10, 2021
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
Prev Previous commit
Next Next commit
s/gg/org
  • Loading branch information
@jbpratt
jbpratt committed Feb 10, 2021
commit 2960f0b2206166315ff4a0724e0366eac602fe4f
2 changes: 1 addition & 1 deletion android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="gg.memelabs.protobuf.rpc">
package="org.memelabs.protobuf.rpc">

<application android:allowBackup="true" />

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/gg/memelabs/protobuf/bridge/AndroidBridge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gg.memelabs.protobuf.bridge
package org.memelabs.protobuf.bridge

interface AndroidBridge {
var onData: (b: ByteArray?) -> Unit
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/java/gg/memelabs/protobuf/rpc/RPCClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gg.memelabs.protobuf.rpc
package org.memelabs.protobuf.rpc

import android.util.Log
import com.squareup.wire.*
import gg.memelabs.protobuf.bridge.AndroidBridge
import org.memelabs.protobuf.bridge.AndroidBridge
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import okio.buffer
Expand Down
2 changes: 1 addition & 1 deletion cmd/ktrpc/ktrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (p *KtRPCModule) generate(f pgs.File) {
// replace package name with file and path to import RPCClient
const rpcTpl = `package {{ package . }}

import gg.memelabs.protobuf.rpc.*
import org.memelabs.protobuf.rpc.*

{{range .Services}}
class {{.Name}}Client(filepath: String) : RPCClient(filepath) {
Expand Down
2 changes: 1 addition & 1 deletion proto/rpc/rpc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ syntax = "proto3";
package strims.rpc;

option go_package = "github.com/MemeLabs/protobuf/pkg/apis/rpc;rpc";
option java_package = "gg.memelabs.protobuf.rpc";
option java_package = "org.memelabs.protobuf.rpc";
option swift_prefix = "SRC";

import "google/protobuf/any.proto";
Expand Down