Skip to content

Commit c0357ef

Browse files
authored
Regenerate SDK from upstream (#36)
* Update gitignore file * Updating WORKSPACE dependencies * Fix generation scripts * Update / clean BUILD files * Regenerate existing SDK files
1 parent 52a8191 commit c0357ef

File tree

9 files changed

+1668
-328
lines changed

9 files changed

+1668
-328
lines changed

.gitignore

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,7 @@
1-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
2-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
1+
bazel-*
2+
**/obj/
33

4-
/bazel-*
5-
6-
# User-specific stuff
4+
*~
75
.idea/
8-
.idea/**/workspace.xml
9-
.idea/**/tasks.xml
10-
.idea/**/usage.statistics.xml
11-
.idea/**/dictionaries
12-
.idea/**/shelf
13-
14-
# Generated files
15-
.idea/**/contentModel.xml
16-
17-
# Sensitive or high-churn files
18-
.idea/**/dataSources/
19-
.idea/**/dataSources.ids
20-
.idea/**/dataSources.local.xml
21-
.idea/**/sqlDataSources.xml
22-
.idea/**/dynamic.xml
23-
.idea/**/uiDesigner.xml
24-
.idea/**/dbnavigator.xml
25-
26-
# Gradle
27-
.idea/**/gradle.xml
28-
.idea/**/libraries
29-
30-
# Gradle and Maven with auto-import
31-
# When using Gradle or Maven with auto-import, you should exclude module files,
32-
# since they will be recreated, and may cause churn. Uncomment if using
33-
# auto-import.
34-
# .idea/modules.xml
35-
# .idea/*.iml
36-
# .idea/modules
37-
38-
# CMake
39-
cmake-build-*/
40-
41-
# Mongo Explorer plugin
42-
.idea/**/mongoSettings.xml
43-
44-
# File-based project format
45-
*.iws
46-
47-
# IntelliJ
48-
out/
49-
50-
# mpeltonen/sbt-idea plugin
51-
.idea_modules/
52-
53-
artefacts/
54-
55-
# JIRA plugin
56-
atlassian-ide-plugin.xml
57-
58-
# Cursive Clojure plugin
59-
.idea/replstate.xml
60-
61-
# Crashlytics plugin (for Android Studio and IntelliJ)
62-
com_crashlytics_export_strings.xml
63-
crashlytics.properties
64-
crashlytics-build.properties
65-
fabric.properties
66-
67-
# Editor-based Rest Client
68-
.idea/httpRequests
69-
70-
# Android studio 3.1+ serialized cache file
71-
.idea/caches/build_file_checksums.ser
6+
.vscode
727

73-
# Build results
74-
[Dd]ebug/
75-
[Dd]ebugPublic/
76-
[Rr]elease/
77-
[Rr]eleases/
78-
x64/
79-
x86/
80-
bld/
81-
[Bb]in/
82-
[Oo]bj/
83-
[Ll]og/

WORKSPACE

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,79 @@
11
http_archive(
2-
name = "bazel_skylib",
3-
url = "https://github.com/bazelbuild/bazel-skylib/archive/ff23a62c57d2912c3073a69c12f42c3d6e58a957.zip",
4-
strip_prefix = "bazel-skylib-ff23a62c57d2912c3073a69c12f42c3d6e58a957",
5-
sha256 = "ccf83f162e4a265b3aa09445c84fbc470215e392b250c86f0ce00536c99d5c17",
2+
name = "bazel_skylib",
3+
sha256 = "ccf83f162e4a265b3aa09445c84fbc470215e392b250c86f0ce00536c99d5c17",
4+
strip_prefix = "bazel-skylib-ff23a62c57d2912c3073a69c12f42c3d6e58a957",
5+
url = "https://github.com/bazelbuild/bazel-skylib/archive/ff23a62c57d2912c3073a69c12f42c3d6e58a957.zip",
66
)
7+
78
load("@bazel_skylib//:lib.bzl", "versions")
8-
versions.check(minimum_bazel_version="0.14.0")
9+
10+
versions.check(
11+
minimum_bazel_version = "0.18.1",
12+
maximum_bazel_version = "0.18.1",
13+
)
914

1015
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
1116

1217
git_repository(
1318
name = "io_bazel_rules_go",
14-
remote = "https://github.com/improbable-io/rules_go.git",
1519
commit = "d22b20a098718f9156f3152e613554860b399c7a",
20+
remote = "https://github.com/improbable-io/rules_go.git",
1621
)
22+
1723
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
18-
go_rules_dependencies()
19-
go_register_toolchains()
2024

21-
git_repository(
22-
name = "org_pubref_rules_protobuf",
23-
remote = "https://github.com/pubref/rules_protobuf",
24-
commit = "5f6195e83e06db2fd110626b0f2dc64e345e6618"
25-
)
26-
load("@org_pubref_rules_protobuf//go:rules.bzl", "go_proto_repositories", "proto_repositories")
27-
go_proto_repositories()
28-
proto_repositories()
25+
go_rules_dependencies()
2926

30-
# git_repository(
31-
# name = "com_google_grpc",
32-
# remote = "https://github.com/grpc/grpc.git",
33-
# commit = "1a60e6971f428323245a930031ad267bb3142ba4",
34-
# shallow_since = "2018-10-01",
35-
# # build_file = "@//third_party/grpc:BUILD",
36-
# )
27+
go_register_toolchains()
3728

3829
git_repository(
3930
name = "io_bazel_rules_dotnet",
31+
commit = "9d3f7951695c95a3ce119c4002c1b67387a2db1e",
4032
remote = "https://github.com/bazelbuild/rules_dotnet.git",
41-
commit = "1a6ca96fe05bca83782464453ac4657fb8ed8379"
4233
)
4334

4435
load("@io_bazel_rules_dotnet//dotnet:csharp.bzl", "csharp_repositories")
36+
4537
csharp_repositories(use_local_mono = True)
4638

4739
git_repository(
48-
name = "org_pubref_rules_protobuf",
49-
remote = "https://github.com/pubref/rules_protobuf",
50-
commit = "7c8c80b61e3a0bc30fd61302d781a317524b0167"
40+
name = "org_pubref_rules_protobuf",
41+
commit = "5f6195e83e06db2fd110626b0f2dc64e345e6618",
42+
remote = "https://github.com/pubref/rules_protobuf",
5143
)
52-
load("@org_pubref_rules_protobuf//csharp:rules.bzl", "csharp_proto_repositories", "new_nuget_package")
44+
45+
load("@org_pubref_rules_protobuf//go:rules.bzl", "go_proto_repositories", "proto_repositories")
46+
load("@org_pubref_rules_protobuf//csharp:rules.bzl", "csharp_proto_repositories")
47+
5348
csharp_proto_repositories()
5449

50+
go_proto_repositories()
51+
52+
proto_repositories()
53+
5554
git_repository(
56-
name = "gapic_generator",
57-
commit = "3a84ca02fca9617e76ed9d59d53aadc3db3826ed",
58-
remote = "[email protected]:improbable/sdk-platform-toolkit.git",
55+
name = "gapic_generator",
56+
commit = "3a84ca02fca9617e76ed9d59d53aadc3db3826ed",
57+
remote = "[email protected]:improbable/sdk-platform-toolkit.git",
5958
)
6059

6160
git_repository(
6261
name = "improbable_platform",
62+
commit = "296b7bd9194204b0a0044555c7d1418416643831",
6363
remote = "[email protected]:improbable/platform.git",
64-
commit = "e0315520c25f65716ca119d85fc76a967916101c",
65-
shallow_since = "2019-04-01",
64+
# Hello! Are you updating the commit of the platform repo dependency? This comment is for you!
65+
# The "shallow_since" field must be set to the day *before* the day of the commit. You can run
66+
# the following script inside the *platform* repo to determine the value you should put in the
67+
# "shallow_since" field based on the commit (replace <commit> with the actual commit hash):
68+
# $ date --date="$(git show --pretty=format:'%cD' <commit> | head --lines=1)-1 day" "+%F"
69+
shallow_since = "2019-07-08",
6670
)
6771

6872
new_git_repository(
6973
name = "com_github_googleapis_googleapis",
70-
remote = "https://github.com/googleapis/googleapis.git",
71-
commit = "672f0d39cadef1b08b36271a9359e2d169ea0a60",
7274
build_file = "@//third_party/googleapis:BUILD",
75+
commit = "672f0d39cadef1b08b36271a9359e2d169ea0a60",
76+
remote = "https://github.com/googleapis/googleapis.git",
7377
)
7478

7579
git_repository(
@@ -80,26 +84,26 @@ git_repository(
8084

8185
new_git_repository(
8286
name = "com_github_mwitkow_go_proto_validators_proto",
87+
build_file = "@//third_party/proto_validators:BUILD",
8388
commit = "61ea39b6438ad463fc5cc6dbf2ebad1286ce7813",
8489
remote = "https://github.com/improbable-io/go-proto-validators",
85-
build_file = "@//third_party/proto_validators:BUILD",
8690
strip_prefix = "src",
8791
)
8892

8993
new_git_repository(
9094
name = "improbable_protoc_gen_gocli",
95+
build_file = "@//third_party/protoc_gen_gocli:BUILD",
9196
commit = "7d7a36b1ec7123d2af3105fe3a3692f8e56880f2",
9297
remote = "[email protected]:improbable/protoc-gen-gocli.git",
93-
build_file = "@//third_party/protoc_gen_gocli:BUILD",
9498
strip_prefix = "bazel_proto",
9599
)
96100

97101
new_git_repository(
98-
name = "com_github_improbable_io_go_proto_logfields_proto",
99-
commit = "6e66e74a1763de7e1372586f671d4a88023297eb",
100-
remote = "https://github.com/improbable-io/go-proto-logfields",
101-
build_file = "@//third_party/proto_logfields:BUILD",
102-
strip_prefix = "src",
102+
name = "com_github_improbable_io_go_proto_logfields_proto",
103+
build_file = "@//third_party/proto_logfields:BUILD",
104+
commit = "6e66e74a1763de7e1372586f671d4a88023297eb",
105+
remote = "https://github.com/improbable-io/go-proto-logfields",
106+
strip_prefix = "src",
103107
)
104108

105109
maven_jar(

apis/deployment_v1alpha1/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ csharp_proto_compile(
2424
"external/improbable_protoc_gen_gocli/",
2525
],
2626
inputs = [
27-
"@com_google_protobuf//:well_known_protos",
2827
"@com_github_googleapis_googleapis//:important_protos",
2928
"@com_github_mwitkow_go_proto_validators_proto//:proto",
3029
"@com_github_improbable_io_go_proto_logfields_proto//:proto",
30+
"@com_google_protobuf//:well_known_protos",
3131
"@improbable_protoc_gen_gocli//:proto",
3232
],
3333
protos = [

0 commit comments

Comments
 (0)