Skip to content

Commit d0090b8

Browse files
authored
Merge pull request #93 from averak/release/v0.3.0
Release/v0.3.0
2 parents ef9a612 + a610c46 commit d0090b8

File tree

163 files changed

+15772
-1045
lines changed

Some content is hidden

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

163 files changed

+15772
-1045
lines changed

.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Language: Proto
2+
BasedOnStyle: Google
3+
AlignConsecutiveAssignments: true
4+
AlignConsecutiveDeclarations: true
5+
ColumnLimit: 0

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
app/adapter/src/main/java/net/averak/gsync/adapter/dao/dto/base/*.java linguist-generated=true
22
app/adapter/src/main/java/net/averak/gsync/adapter/dao/mapper/base/*.java linguist-generated=true
33
src/main/resources/dao/base/*.xml linguist-generated=true
4+
protobuf/** linguist-generated=true

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
distribution: corretto
2424
java-version: 17
2525
cache: gradle
26-
- uses: google-github-actions/setup-gcloud@v1
2726

2827
- name: cache sonar packages
2928
uses: actions/cache@v3

Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
PROTOC_GEN_JAVA_VERSION=1.61.0
2+
PROTOC_GEN_JAVA_PATH=tmp/bin/protoc-gen-grpc-java.exe
3+
14
.PHONY: build
25
build:
36
./gradlew bootJar
@@ -14,8 +17,21 @@ lint:
1417
format:
1518
./gradlew spotlessApply
1619

20+
.PHONY: install-protoc-gen-plugin
21+
install-protoc-gen-plugin:
22+
mkdir -p tmp/bin
23+
wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${PROTOC_GEN_JAVA_VERSION}/protoc-gen-grpc-java-${PROTOC_GEN_JAVA_VERSION}-osx-x86_64.exe -O ${PROTOC_GEN_JAVA_PATH}
24+
chmod +x ${PROTOC_GEN_JAVA_PATH}
25+
1726
.PHONY: codegen
1827
codegen:
28+
rm -rf protobuf
29+
mkdir -p protobuf/src/main/java
30+
find ./schema/protobuf -name "*.proto" | xargs -I {} protoc \
31+
-I=schema/protobuf \
32+
--plugin=protoc-gen-grpc-java=${PROTOC_GEN_JAVA_PATH} \
33+
--java_out=protobuf/src/main/java \
34+
--grpc-java_out=protobuf/src/main/java {}
1935
./gradlew mbGenerate
2036
./gradlew spotlessApply
2137

app/adapter/src/main/java/net/averak/gsync/adapter/dao/dto/base/AbstractDto.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/adapter/src/main/java/net/averak/gsync/adapter/dao/dto/base/EchoDto.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/adapter/src/main/java/net/averak/gsync/adapter/dao/dto/base/EchoExample.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/adapter/src/main/java/net/averak/gsync/adapter/dao/dto/base/FriendSettingMasterDto.java

Lines changed: 213 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)