Skip to content

Commit

Permalink
Upgrade dependencies (#48)
Browse files Browse the repository at this point in the history 
* Upgrade dependencies

* Fix 'swagger-core' dependency

* Upgrade sisyphus version in readme

* Reformat protos
  • Loading branch information
@devkanro
devkanro authored Jul 17, 2020
1 parent 8108fec commit c04a8e1
Show file tree
Hide file tree
Showing 53 changed files with 2,836 additions and 2,836 deletions.
18 changes: 9 additions & 9 deletions ReadMe.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
plugins {
`java-library` // We build this project as a java library.
kotlin("jvm") version "1.3.72" // Use the kotlin plugin to compile .kt files
id("com.bybutter.sisyphus.project") version "0.0.3" // Use the sisyphus project management plugin.
id("com.bybutter.sisyphus.protobuf") version "0.0.3" // Use the sisyphus protobuf compiler plugin.
id("com.bybutter.sisyphus.project") version "0.0.5" // Use the sisyphus project management plugin.
id("com.bybutter.sisyphus.protobuf") version "0.0.5" // Use the sisyphus protobuf compiler plugin.
}

dependencies {
api("com.bybutter.sisyphus:sisyphus-grpc:0.0.3") // Dependent on sisyphus grpc runtime.
api("com.bybutter.sisyphus:sisyphus-grpc:0.0.5") // Dependent on sisyphus grpc runtime.
/*proto("com.foo.bar:baz:1.0.0")*/ // Use 'proto' configuration to config jars need to compile proto.
/*protoApi("com.foo.bar:baz:1.0.0")*/ // Use 'protoApi' configuration to config needed jars in proto compiling.
// All dependencies in 'implementation' configuration will auto add to 'protoApi' configuration.
Expand Down Expand Up @@ -163,11 +163,11 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
plugins {
`java-library`
kotlin("jvm") version "1.3.72"
id("com.bybutter.sisyphus.project") version "0.0.3"
id("com.bybutter.sisyphus.project") version "0.0.5"
}

dependencies {
api("com.bybutter.sisyphus.middleware:sisyphus-grpc-client:0.0.3") // Dependent on spring grpc runtime.
api("com.bybutter.sisyphus.middleware:sisyphus-grpc-client:0.0.5") // Dependent on spring grpc runtime.
api(project("schema:example-schema")) // Dependent on schema project.
}
```
Expand Down Expand Up @@ -210,13 +210,13 @@ Ready to rolling boulder with Sisyphus already? Hold on! We need to plan our rou
application
kotlin("jvm") version "1.3.72"
`kotlin-spring`
id("com.bybutter.sisyphus.project") version "0.0.3"
id("com.bybutter.sisyphus.project") version "0.0.5"
}

dependencies {
implementation("com.bybutter.sisyphus.starter:sisyphus-grpc-server-starter:0.0.3") // Dependent on spring grpc starter.
implementation("com.bybutter.sisyphus.starter:sisyphus-grpc-transcoding-starter:0.0.3") // [Optional] Enable the http-transcoding feature.
implementation("com.bybutter.sisyphus.starter:sisyphus-protobuf-type-server-starter:0.0.3") // [Optional] Enable the type server feature.
implementation("com.bybutter.sisyphus.starter:sisyphus-grpc-server-starter:0.0.5") // Dependent on spring grpc starter.
implementation("com.bybutter.sisyphus.starter:sisyphus-grpc-transcoding-starter:0.0.5") // [Optional] Enable the http-transcoding feature.
implementation("com.bybutter.sisyphus.starter:sisyphus-protobuf-type-server-starter:0.0.5") // [Optional] Enable the type server feature.
implementation(project("service:example-service")) // Dependent on service project.
}
```
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ plugins {
`java-library`
`kotlin-dsl`
id("idea")
id("com.bybutter.sisyphus.project") version "0.0.4-M0"
id("com.bybutter.sisyphus.project") version "0.0.4"
}

dependencies {
implementation(platform("com.bybutter.sisyphus:sisyphus-dependencies:0.0.4-M0"))
implementation(platform("com.bybutter.sisyphus:sisyphus-dependencies:0.0.4"))
implementation("com.bybutter.sisyphus.tools:sisyphus-protobuf-gradle-plugin")
implementation("com.bybutter.sisyphus.tools:sisyphus-project-gradle-plugin")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
Expand Down
6 changes: 3 additions & 3 deletions dependencies/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
api("org.apache.maven.wagon:wagon-http:3.4.1")
api("org.junit.jupiter:junit-jupiter:5.6.2")
api("org.reflections:reflections:0.9.12")
api("com.squareup.okhttp3:okhttp:4.7.2")
api("com.squareup.okhttp3:okhttp:4.8.0")
api("com.squareup.retrofit2:retrofit:2.9.0")
api("io.github.resilience4j:resilience4j-retrofit:1.5.0")
api("org.antlr:antlr4:4.8")
Expand All @@ -46,11 +46,11 @@ dependencies {
api("com.github.ben-manes:gradle-versions-plugin:0.28.0")
api("com.netflix.nebula:nebula-publishing-plugin:17.3.0")
api("com.netflix.nebula:gradle-contacts-plugin:5.1.0")
api("com.netflix.nebula:gradle-info-plugin:8.3.1")
api("com.netflix.nebula:gradle-info-plugin:8.3.2")
api("org.gradle.kotlin:plugins:1.3.6")
api("com.gradle.publish:plugin-publish-plugin:0.12.0")
api("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
api("com.palantir.gradle.docker:gradle-docker:0.25.0")
api("io.grpc:grpc-kotlin-stub:0.1.3")
api("io.grpc:grpc-kotlin-stub:0.1.4")
}
}
4 changes: 2 additions & 2 deletions lib/sisyphus-grpc/src/main/proto/sisyphus/api/paging/paging.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ option java_package = "com.bybutter.sisyphus.api.paging";
option objc_class_prefix = "SIS";

message NameAnchorPaging {
string name = 1;
string name = 1;
}

message OffsetPaging {
int32 offset = 1;
int32 offset = 1;
}
4 changes: 2 additions & 2 deletions lib/sisyphus-grpc/src/main/proto/sisyphus/api/service_meta.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ option java_package = "com.bybutter.sisyphus.api";
option objc_class_prefix = "SIS";

message ServiceMetadata {
string name = 1;
string name = 1;
}

extend google.protobuf.ServiceOptions {
ServiceMetadata metadata = 26051;
ServiceMetadata metadata = 26051;
}
2 changes: 1 addition & 1 deletion lib/sisyphus-protobuf/src/main/proto/sisyphus/protobuf/enum.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ option java_package = "com.bybutter.sisyphus.protobuf";
option objc_class_prefix = "SIS";

extend google.protobuf.EnumValueOptions {
string string = 26051;
string string = 26051;
}
26 changes: 13 additions & 13 deletions lib/sisyphus-protobuf/src/test/proto/extension_test.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,39 @@ package com.bybutter.sisyphus.protobuf.test;
import "google/protobuf/descriptor.proto";

extend google.protobuf.FileOptions {
optional string my_file_option = 50000;
optional string my_file_option = 50000;
}
extend google.protobuf.MessageOptions {
optional int32 my_message_option = 50001;
optional int32 my_message_option = 50001;
}
extend google.protobuf.FieldOptions {
optional float my_field_option = 50002;
optional float my_field_option = 50002;
}
extend google.protobuf.EnumOptions {
optional bool my_enum_option = 50003;
optional bool my_enum_option = 50003;
}
extend google.protobuf.EnumValueOptions {
optional uint32 my_enum_value_option = 50004;
optional uint32 my_enum_value_option = 50004;
}
extend google.protobuf.ServiceOptions {
optional MyEnum my_service_option = 50005;
optional MyEnum my_service_option = 50005;
}
extend google.protobuf.MethodOptions {
optional MyMessage my_method_option = 50006;
optional MyMessage my_method_option = 50006;
}

option (my_file_option) = "Hello world!";

message MyMessage {
option (my_message_option) = 1234;
option (my_message_option) = 1234;

optional int32 foo = 1 [(my_field_option) = 4.5];
optional string bar = 2;
optional int32 foo = 1 [(my_field_option) = 4.5];
optional string bar = 2;
}

enum MyEnum {
option (my_enum_option) = true;
option (my_enum_option) = true;

FOO = 1 [(my_enum_value_option) = 321];
BAR = 2;
FOO = 1 [(my_enum_value_option) = 321];
BAR = 2;
}
50 changes: 25 additions & 25 deletions lib/sisyphus-protobuf/src/test/proto/test.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,39 @@ import "google/protobuf/any.proto";
package com.bybutter.sisyphus.protobuf.test;

message BaseTypeTest {
string string_value = 1;
int32 int32_value = 2;
int64 int64_value = 3;
string string_value = 1;
int32 int32_value = 2;
int64 int64_value = 3;
}

message NestedMessageTest {
int32 start_value = 1;
NestedMessage nested_message_value = 2;
int32 end_value = 3;
message NestedMessage {
int32 int32_value = 1;
}
int32 start_value = 1;
NestedMessage nested_message_value = 2;
int32 end_value = 3;
message NestedMessage {
int32 int32_value = 1;
}
}

message MapMessageTest {
int32 start_value = 1;
map<string, NestedMessage> message_map_value = 2;
map<int32, bool> base_type_map_value = 3;
int32 end_value = 4;
oneof oneTest {
int32 int_oneof_value = 5;
string string_oneof_value = 6;
}
google.protobuf.Timestamp timestamp = 7;
google.protobuf.Duration duration = 8;
map<string, google.protobuf.Any> any_map_value = 9;
repeated google.protobuf.Any any_list_value = 10;
int32 start_value = 1;
map<string, NestedMessage> message_map_value = 2;
map<int32, bool> base_type_map_value = 3;
int32 end_value = 4;
oneof oneTest {
int32 int_oneof_value = 5;
string string_oneof_value = 6;
}
google.protobuf.Timestamp timestamp = 7;
google.protobuf.Duration duration = 8;
map<string, google.protobuf.Any> any_map_value = 9;
repeated google.protobuf.Any any_list_value = 10;

message NestedMessage {
int32 int32_value = 1;
}
message NestedMessage {
int32 int32_value = 1;
}
}

message PackedTest {
repeated int32 values = 1;
repeated int32 values = 1;
}
Loading

0 comments on commit c04a8e1

Please sign in to comment.