reorganize dir structure

MemeLabs · jbpratt · Feb 11, 2021 · Feb 10, 2021 · Feb 10, 2021 · Feb 10, 2021
commit f35e6849409ba8b92a65fa5cf9f061985d11dbf5
diff --git a/.github/workflows/android_build.yaml b/.github/workflows/android_build.yaml
@@ -0,0 +1,16 @@
+name: Android CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 .idea/
 lib
+**/build/
+.gradle/
diff --git a/android/rpc/app/build.gradle → android/build.gradle b/android/rpc/app/build.gradle → android/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 wire {
     sourcePath {
-        srcDir '../../../proto'
+        srcDir '../proto'
     }
 
     kotlin {
@@ -56,4 +56,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
+}
diff --git a/android/rpc/app/proguard-rules.pro → android/proguard-rules.pro b/android/rpc/app/proguard-rules.pro → android/proguard-rules.pro
diff --git a/android/rpc/.gitignore b/android/rpc/.gitignore
diff --git a/android/rpc/app/.gitignore b/android/rpc/app/.gitignore
diff --git a/android/rpc/app/src/main/AndroidManifest.xml b/android/rpc/app/src/main/AndroidManifest.xml
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="gg.memelabs.protobuf.rpc">
+
+    <application android:allowBackup="true" />
+
+</manifest>
diff --git a/...memelabs/protobuf/bridge/AndroidBridge.kt → ...memelabs/protobuf/bridge/AndroidBridge.kt b/...memelabs/protobuf/bridge/AndroidBridge.kt → ...memelabs/protobuf/bridge/AndroidBridge.kt
diff --git a/...ain/java/gg/memelabs/protobuf/rpc/Call.kt → ...ain/java/gg/memelabs/protobuf/rpc/Call.kt b/...ain/java/gg/memelabs/protobuf/rpc/Call.kt → ...ain/java/gg/memelabs/protobuf/rpc/Call.kt
diff --git a/...n/java/gg/memelabs/protobuf/rpc/Cancel.kt → ...n/java/gg/memelabs/protobuf/rpc/Cancel.kt b/...n/java/gg/memelabs/protobuf/rpc/Cancel.kt → ...n/java/gg/memelabs/protobuf/rpc/Cancel.kt
diff --git a/...in/java/gg/memelabs/protobuf/rpc/Close.kt → ...in/java/gg/memelabs/protobuf/rpc/Close.kt b/...in/java/gg/memelabs/protobuf/rpc/Close.kt → ...in/java/gg/memelabs/protobuf/rpc/Close.kt
diff --git a/...in/java/gg/memelabs/protobuf/rpc/Error.kt → ...in/java/gg/memelabs/protobuf/rpc/Error.kt b/...in/java/gg/memelabs/protobuf/rpc/Error.kt → ...in/java/gg/memelabs/protobuf/rpc/Error.kt
diff --git a/...ava/gg/memelabs/protobuf/rpc/RPCClient.kt → ...ava/gg/memelabs/protobuf/rpc/RPCClient.kt b/...ava/gg/memelabs/protobuf/rpc/RPCClient.kt → ...ava/gg/memelabs/protobuf/rpc/RPCClient.kt
diff --git a/...ava/gg/memelabs/protobuf/rpc/Undefined.kt → ...ava/gg/memelabs/protobuf/rpc/Undefined.kt b/...ava/gg/memelabs/protobuf/rpc/Undefined.kt → ...ava/gg/memelabs/protobuf/rpc/Undefined.kt
diff --git a/...a/gg/strims/rpc/test/GrpcRPCTestClient.kt → ...a/gg/strims/rpc/test/GrpcRPCTestClient.kt b/...a/gg/strims/rpc/test/GrpcRPCTestClient.kt → ...a/gg/strims/rpc/test/GrpcRPCTestClient.kt
diff --git a/...g/strims/rpc/test/RPCCallStreamRequest.kt → ...g/strims/rpc/test/RPCCallStreamRequest.kt b/...g/strims/rpc/test/RPCCallStreamRequest.kt → ...g/strims/rpc/test/RPCCallStreamRequest.kt
diff --git a/.../strims/rpc/test/RPCCallStreamResponse.kt → .../strims/rpc/test/RPCCallStreamResponse.kt b/.../strims/rpc/test/RPCCallStreamResponse.kt → .../strims/rpc/test/RPCCallStreamResponse.kt
diff --git a/...gg/strims/rpc/test/RPCCallUnaryRequest.kt → ...gg/strims/rpc/test/RPCCallUnaryRequest.kt b/...gg/strims/rpc/test/RPCCallUnaryRequest.kt → ...gg/strims/rpc/test/RPCCallUnaryRequest.kt
diff --git a/...g/strims/rpc/test/RPCCallUnaryResponse.kt → ...g/strims/rpc/test/RPCCallUnaryResponse.kt b/...g/strims/rpc/test/RPCCallUnaryResponse.kt → ...g/strims/rpc/test/RPCCallUnaryResponse.kt
diff --git a/.../java/gg/strims/rpc/test/RPCTestClient.kt → .../java/gg/strims/rpc/test/RPCTestClient.kt b/.../java/gg/strims/rpc/test/RPCTestClient.kt → .../java/gg/strims/rpc/test/RPCTestClient.kt
diff --git a/android/rpc/build.gradle → build.gradle b/android/rpc/build.gradle → build.gradle
diff --git a/android/rpc/gradle.properties → gradle.properties b/android/rpc/gradle.properties → gradle.properties
diff --git a/...oid/rpc/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar b/...oid/rpc/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties
diff --git a/android/rpc/gradlew → gradlew b/android/rpc/gradlew → gradlew
diff --git a/android/rpc/gradlew.bat → gradlew.bat b/android/rpc/gradlew.bat → gradlew.bat
diff --git a/local.properties b/local.properties
@@ -0,0 +1,10 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file should *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/home/jbpratt/Android/Sdk
diff --git a/android/rpc/settings.gradle → settings.gradle b/android/rpc/settings.gradle → settings.gradle
@@ -1,2 +1,2 @@
 rootProject.name = "rpc"
-include ':app'
+include ':android'