Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

Commit db43071

Browse files
prepare 5.6.6 release (#254)
1 parent 5c90bd5 commit db43071

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ shadowJar {
245245
exclude '**/*.kotlin_module'
246246
exclude '**/*.kotlin_builtins'
247247

248+
// Shadow is not supposed to copy any module-info.class files from dependencies,
249+
// but sometimes it does unless we explicitly exclude them here
250+
exclude '**/module-info.class'
251+
248252
// doFirst causes the following steps to be run during Gradle's execution phase rather than the
249253
// configuration phase; this is necessary because they access the build products
250254
doFirst {
@@ -274,6 +278,8 @@ task shadowJarAll(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJ
274278
exclude '**/*.kotlin_module'
275279
exclude '**/*.kotlin_builtins'
276280

281+
exclude '**/module-info.class'
282+
277283
dependencies {
278284
// We don't need to exclude anything here, because we want everything to be
279285
// embedded in the "all" jar.

packaging-test/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ RUN_JARS_test-thin-jar=$(TEST_APP_JAR) $(SDK_THIN_JAR) \
5353
classes_prepare=echo " checking $(1)..." && $(JAR) tf $(1) | grep '\.class$$' >$(TEMP_OUTPUT)
5454
classes_should_contain=echo " should contain $(2)" && grep "^$(1)/.*\.class$$" $(TEMP_OUTPUT) >/dev/null
5555
classes_should_not_contain=echo " should not contain $(2)" && ! grep "^$(1)/.*\.class$$" $(TEMP_OUTPUT)
56+
should_not_have_module_info=echo " should not have module-info.class" && ! grep "module-info\.class$$" $(TEMP_OUTPUT)
5657

5758
verify_sdk_classes= \
5859
$(call classes_should_contain,com/launchdarkly/sdk,com.launchdarkly.sdk) && \
@@ -93,6 +94,7 @@ test-all-jar-classes: $(SDK_ALL_JAR) $(TEMP_DIR)
9394
@$(call classes_should_not_contain,com/fasterxml/jackson,unshaded Jackson)
9495
@$(call classes_should_not_contain,com/launchdarkly/shaded/com/fasterxml/jackson,shaded Jackson)
9596
@$(call classes_should_not_contain,com/launchdarkly/shaded/org/slf4j,shaded SLF4j)
97+
@$(call should_not_have_module_info)
9698
@$(call manifest_should_not_have_classpath,$<)
9799

98100
test-default-jar-classes: $(SDK_DEFAULT_JAR) $(TEMP_DIR)
@@ -106,6 +108,7 @@ test-default-jar-classes: $(SDK_DEFAULT_JAR) $(TEMP_DIR)
106108
@$(call classes_should_not_contain,com/fasterxml/jackson,unshaded Jackson)
107109
@$(call classes_should_not_contain,com/launchdarkly/shaded/com/fasterxml/jackson,shaded Jackson)
108110
@$(call classes_should_not_contain,org/slf4j,unshaded SLF4j)
111+
@$(call should_not_have_module_info)
109112
@$(call manifest_should_not_have_classpath,$<)
110113

111114
test-thin-jar-classes: $(SDK_THIN_JAR) $(TEMP_DIR)
@@ -114,6 +117,7 @@ test-thin-jar-classes: $(SDK_THIN_JAR) $(TEMP_DIR)
114117
@$(call verify_sdk_classes)
115118
@echo " should not contain anything other than SDK classes"
116119
@! grep -v "^com/launchdarkly/sdk" $(TEMP_OUTPUT)
120+
@$(call should_not_have_module_info)
117121
@$(call manifest_should_not_have_classpath,$<)
118122

119123
test-pom: $(POM_XML)

0 commit comments

Comments
 (0)