Skip to content

Commit

Permalink
Merge pull request #7 from Bogdan-Catalin/upgrade-bazel-5.0.0
Browse files Browse the repository at this point in the history
Update to bazel 5 and java 17
  • Loading branch information
birdayz authored Feb 11, 2022
2 parents 4f91544 + c10962d commit c06dfa8
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .bazeliskrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USE_BAZEL_VERSION=3.7.0
USE_BAZEL_VERSION=5.0.0
10 changes: 9 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
build --disk_cache=/tmp --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 --protocopt=--experimental_allow_proto3_optional
build --disk_cache=/tmp --protocopt=--experimental_allow_proto3_optional
build --java_language_version=17
build --java_runtime_version=remotejdk_17
build --tool_java_language_version=17
build --tool_java_runtime_version=remotejdk_17
test --disk_cache=/tmp --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 --protocopt=--experimental_allow_proto3_optional --test_summary=detailed --test_output=all
test --java_language_version=17
test --java_runtime_version=remotejdk_17
test --tool_java_language_version=17
test --tool_java_runtime_version=remotejdk_17
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ gradle-app.setting
/.project
/.settings
.ijwb
*.iml
/bazel-bin
/bazel-kafka-streams-contrib
/bazel-out
Expand Down
19 changes: 16 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,25 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

# Maven rules
git_repository(
RULES_JVM_EXTERNAL_TAG = "4.2"

RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"

http_archive(
name = "rules_jvm_external",
commit = "0dca0d770e2df942a6eab24386d84991c987c328",
remote = "https://github.com/bazelbuild/rules_jvm_external.git",
sha256 = RULES_JVM_EXTERNAL_SHA,
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
)

load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")

rules_jvm_external_deps()

load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")

rules_jvm_external_setup()

load("@rules_jvm_external//:defs.bzl", "maven_install")

maven_install(
Expand Down
1 change: 1 addition & 0 deletions proto/keyvalue.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ syntax = "proto3";

package protobuf;

option java_outer_classname = "BazelKeyValue";
option java_package = "de.nerden.kafka.streams.proto";
option java_multiple_files = true;

Expand Down

0 comments on commit c06dfa8

Please sign in to comment.