Skip to content

Commit 9fc4108

Browse files
committed
Add missing jars to combined jar for api and reduce some source/target versions from 8 to 7.
1 parent 6e97e9e commit 9fc4108

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

api/BUILD

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ STACK_GETTER_COMMON=$(location :stack_getter_common)
100100
CHECKS=$(location :checks)
101101
JAVABASE=$$PWD/$(JAVABASE)
102102
JAR=$$PWD/$(JAVABASE)/bin/jar
103-
$$JAVABASE/bin/javac -d $$TMPDIR -source 1.8 -target 1.8 -cp $${STACK_GETTER_COMMON}:$${CHECKS} -implicit:none \
103+
$$JAVABASE/bin/javac -d $$TMPDIR -source 8 -target 8 -cp $${STACK_GETTER_COMMON}:$${CHECKS} -implicit:none \
104104
$(location src/main/java/com/google/common/flogger/util/StackWalkerStackGetter.java)
105105
cd $$TMPDIR && $$JAR cf $$OUTPUT com/google/common/flogger/util/*StackGetter*.class
106106
""",
@@ -111,14 +111,14 @@ cd $$TMPDIR && $$JAR cf $$OUTPUT com/google/common/flogger/util/*StackGetter*.cl
111111
java_library(
112112
name = "stack_getter_common",
113113
srcs = STACK_GETTER_COMMON_SRCS,
114-
javacopts = ["-source 8 -target 8"],
114+
javacopts = ["-source 7 -target 7"],
115115
deps = [":checks"],
116116
)
117117

118118
java_library(
119119
name = "checks",
120120
srcs = CHECKS,
121-
javacopts = ["-source 8 -target 8"],
121+
javacopts = ["-source 7 -target 7"],
122122
)
123123

124124
pom_file(
@@ -132,7 +132,10 @@ jarjar_library(
132132
name = "merged_api",
133133
jars = [
134134
":api",
135+
":checks",
135136
":platform_provider",
137+
":stack_getter_common",
138+
":stack_getter_impl",
136139
],
137140
)
138141

0 commit comments

Comments
 (0)