Skip to content

Commit ae07b2d

Browse files
authored
mobile: gobridge cache and rework wire gen (#84)
closes #81 updates #76
1 parent 96caef6 commit ae07b2d

File tree

299 files changed

+1832
-13826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+1832
-13826
lines changed

.github/workflows/android-ci.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: lint and build android app
22
on:
33
pull_request:
44
paths:
5+
- '.github/workflows/android-ci.yaml'
56
- 'android/**'
67
push:
78
branches:
@@ -18,6 +19,11 @@ jobs:
1819
uses: actions/setup-ruby@v1
1920
with:
2021
ruby-version: 2.6.x
22+
- uses: actions/cache@v2
23+
id: cache
24+
with:
25+
path: android/app/libs/bridge.aar
26+
key: ${{ runner.os }}-${{ hashFiles('android/bridge/*') }}
2127
- name: Install Dependencies
2228
working-directory: ./android
2329
run: gem install bundler && bundle install
@@ -28,8 +34,9 @@ jobs:
2834
- name: set up Go
2935
uses: actions/setup-go@v2
3036
with:
31-
go-version: '^1.14'
37+
go-version: '^1.15'
3238
- name: Build Go bridge
39+
if: steps.cache.outputs.cache-hit != 'true'
3340
run: |
3441
go get golang.org/x/mobile/cmd/gomobile
3542
go mod download

android/.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

android/app/build.gradle

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,32 @@ plugins {
66
id 'com.squareup.wire'
77
}
88

9-
task sanitizeProto(type: Exec) {
10-
workingDir "../../"
11-
commandLine "hack/sanitize-proto.sh"
12-
}
13-
14-
preBuild.dependsOn sanitizeProto
15-
169
wire {
1710
sourcePath {
18-
srcDir '../../schema/sanitized'
11+
srcDir '../../schema'
1912
}
2013

2114
kotlin {
2215
out = 'src/main/java'
2316
}
2417
}
2518

19+
//task deleteServices(type: Delete) {
20+
// doLast {
21+
// delete 'app/src/main/java/gg/strims/video/v1/VideoIngressShareClient.kt'
22+
// delete fileTree('app/src/main/java/gg/strims/') {
23+
// include '**/*Client.kt'
24+
// }
25+
// }
26+
//}
27+
28+
task deleteServices(type: Exec) {
29+
workingDir "../../"
30+
commandLine "hack/sanitize-proto.sh"
31+
}
32+
33+
generateProtos.finalizedBy deleteServices
34+
2635
android {
2736
compileSdkVersion 30
2837

android/app/src/main/java/gg/strims/ppspp/proto/Mutex.kt renamed to android/app/src/main/java/gg/strims/dao/v1/Mutex.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: Mutex in profile.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.dao.v1.Mutex in dao/v1/dao.proto
3+
package gg.strims.dao.v1
44

55
import com.squareup.wire.FieldEncoding
66
import com.squareup.wire.Message
@@ -22,9 +22,6 @@ import kotlin.hashCode
2222
import kotlin.jvm.JvmField
2323
import okio.ByteString
2424

25-
/**
26-
* ---
27-
*/
2825
class Mutex(
2926
@field:WireField(
3027
tag = 1,
@@ -84,7 +81,7 @@ class Mutex(
8481
val ADAPTER: ProtoAdapter<Mutex> = object : ProtoAdapter<Mutex>(
8582
FieldEncoding.LENGTH_DELIMITED,
8683
Mutex::class,
87-
"type.googleapis.com/Mutex",
84+
"type.googleapis.com/strims.dao.v1.Mutex",
8885
PROTO_3,
8986
null
9087
) {

android/app/src/main/java/gg/strims/ppspp/proto/SecondaryIndexKey.kt renamed to android/app/src/main/java/gg/strims/dao/v1/SecondaryIndexKey.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: SecondaryIndexKey in dao.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.dao.v1.SecondaryIndexKey in dao/v1/dao.proto
3+
package gg.strims.dao.v1
44

55
import com.squareup.wire.FieldEncoding
66
import com.squareup.wire.Message
@@ -81,7 +81,7 @@ class SecondaryIndexKey(
8181
val ADAPTER: ProtoAdapter<SecondaryIndexKey> = object : ProtoAdapter<SecondaryIndexKey>(
8282
FieldEncoding.LENGTH_DELIMITED,
8383
SecondaryIndexKey::class,
84-
"type.googleapis.com/SecondaryIndexKey",
84+
"type.googleapis.com/strims.dao.v1.SecondaryIndexKey",
8585
PROTO_3,
8686
null
8787
) {

android/app/src/main/java/gg/strims/ppspp/proto/MetricsFormat.kt renamed to android/app/src/main/java/gg/strims/debug/v1/MetricsFormat.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: MetricsFormat in debug.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.debug.v1.MetricsFormat in debug/v1/debug.proto
3+
package gg.strims.debug.v1
44

55
import com.squareup.wire.EnumAdapter
66
import com.squareup.wire.ProtoAdapter

android/app/src/main/java/gg/strims/ppspp/proto/PProfRequest.kt renamed to android/app/src/main/java/gg/strims/debug/v1/PProfRequest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: PProfRequest in debug.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.debug.v1.PProfRequest in debug/v1/debug.proto
3+
package gg.strims.debug.v1
44

55
import com.squareup.wire.FieldEncoding
66
import com.squareup.wire.Message
@@ -92,7 +92,7 @@ class PProfRequest(
9292
val ADAPTER: ProtoAdapter<PProfRequest> = object : ProtoAdapter<PProfRequest>(
9393
FieldEncoding.LENGTH_DELIMITED,
9494
PProfRequest::class,
95-
"type.googleapis.com/PProfRequest",
95+
"type.googleapis.com/strims.debug.v1.PProfRequest",
9696
PROTO_3,
9797
null
9898
) {

android/app/src/main/java/gg/strims/ppspp/proto/PProfResponse.kt renamed to android/app/src/main/java/gg/strims/debug/v1/PProfResponse.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: PProfResponse in debug.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.debug.v1.PProfResponse in debug/v1/debug.proto
3+
package gg.strims.debug.v1
44

55
import com.squareup.wire.FieldEncoding
66
import com.squareup.wire.Message
@@ -82,7 +82,7 @@ class PProfResponse(
8282
val ADAPTER: ProtoAdapter<PProfResponse> = object : ProtoAdapter<PProfResponse>(
8383
FieldEncoding.LENGTH_DELIMITED,
8484
PProfResponse::class,
85-
"type.googleapis.com/PProfResponse",
85+
"type.googleapis.com/strims.debug.v1.PProfResponse",
8686
PROTO_3,
8787
null
8888
) {

android/app/src/main/java/gg/strims/ppspp/proto/ReadMetricsRequest.kt renamed to android/app/src/main/java/gg/strims/debug/v1/ReadMetricsRequest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: ReadMetricsRequest in debug.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.debug.v1.ReadMetricsRequest in debug/v1/debug.proto
3+
package gg.strims.debug.v1
44

55
import com.squareup.wire.FieldEncoding
66
import com.squareup.wire.Message
@@ -25,7 +25,7 @@ import okio.ByteString
2525
class ReadMetricsRequest(
2626
@field:WireField(
2727
tag = 1,
28-
adapter = "gg.strims.ppspp.proto.MetricsFormat#ADAPTER",
28+
adapter = "gg.strims.debug.v1.MetricsFormat#ADAPTER",
2929
label = WireField.Label.OMIT_IDENTITY
3030
)
3131
val format: MetricsFormat = MetricsFormat.METRICS_FORMAT_TEXT,
@@ -69,7 +69,7 @@ class ReadMetricsRequest(
6969
val ADAPTER: ProtoAdapter<ReadMetricsRequest> = object : ProtoAdapter<ReadMetricsRequest>(
7070
FieldEncoding.LENGTH_DELIMITED,
7171
ReadMetricsRequest::class,
72-
"type.googleapis.com/ReadMetricsRequest",
72+
"type.googleapis.com/strims.debug.v1.ReadMetricsRequest",
7373
PROTO_3,
7474
null
7575
) {

android/app/src/main/java/gg/strims/ppspp/proto/ReadMetricsResponse.kt renamed to android/app/src/main/java/gg/strims/debug/v1/ReadMetricsResponse.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Code generated by Wire protocol buffer compiler, do not edit.
2-
// Source: ReadMetricsResponse in debug.proto
3-
package gg.strims.ppspp.proto
2+
// Source: strims.debug.v1.ReadMetricsResponse in debug/v1/debug.proto
3+
package gg.strims.debug.v1
44

55
import com.squareup.wire.FieldEncoding
66
import com.squareup.wire.Message
@@ -69,7 +69,7 @@ class ReadMetricsResponse(
6969
val ADAPTER: ProtoAdapter<ReadMetricsResponse> = object : ProtoAdapter<ReadMetricsResponse>(
7070
FieldEncoding.LENGTH_DELIMITED,
7171
ReadMetricsResponse::class,
72-
"type.googleapis.com/ReadMetricsResponse",
72+
"type.googleapis.com/strims.debug.v1.ReadMetricsResponse",
7373
PROTO_3,
7474
null
7575
) {

0 commit comments

Comments
 (0)