From db43071bb8d06f526fb2fb9d3106cb053357fee3 Mon Sep 17 00:00:00 2001
From: LaunchDarklyReleaseBot
 <86431345+LaunchDarklyReleaseBot@users.noreply.github.com>
Date: Fri, 7 Jan 2022 15:47:27 -0500
Subject: [PATCH] prepare 5.6.6 release (#254)

---
 build.gradle            | 6 ++++++
 packaging-test/Makefile | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/build.gradle b/build.gradle
index 45e88b080..98f9080d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -245,6 +245,10 @@ shadowJar {
     exclude '**/*.kotlin_module'
     exclude '**/*.kotlin_builtins'
 
+    // Shadow is not supposed to copy any module-info.class files from dependencies,
+    // but sometimes it does unless we explicitly exclude them here
+    exclude '**/module-info.class'
+
     // doFirst causes the following steps to be run during Gradle's execution phase rather than the
     // configuration phase; this is necessary because they access the build products
     doFirst {
@@ -274,6 +278,8 @@ task shadowJarAll(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJ
     exclude '**/*.kotlin_module'
     exclude '**/*.kotlin_builtins'
 
+    exclude '**/module-info.class'
+
     dependencies {
         // We don't need to exclude anything here, because we want everything to be
         // embedded in the "all" jar.
diff --git a/packaging-test/Makefile b/packaging-test/Makefile
index d79ce3329..972a82506 100644
--- a/packaging-test/Makefile
+++ b/packaging-test/Makefile
@@ -53,6 +53,7 @@ RUN_JARS_test-thin-jar=$(TEST_APP_JAR) $(SDK_THIN_JAR) \
 classes_prepare=echo "  checking $(1)..." && $(JAR) tf $(1) | grep '\.class$$' >$(TEMP_OUTPUT)
 classes_should_contain=echo "    should contain $(2)" && grep "^$(1)/.*\.class$$" $(TEMP_OUTPUT) >/dev/null
 classes_should_not_contain=echo "    should not contain $(2)" && ! grep "^$(1)/.*\.class$$" $(TEMP_OUTPUT)
+should_not_have_module_info=echo "    should not have module-info.class" && ! grep "module-info\.class$$" $(TEMP_OUTPUT)
 
 verify_sdk_classes= \
 	$(call classes_should_contain,com/launchdarkly/sdk,com.launchdarkly.sdk) && \
@@ -93,6 +94,7 @@ test-all-jar-classes: $(SDK_ALL_JAR) $(TEMP_DIR)
 	@$(call classes_should_not_contain,com/fasterxml/jackson,unshaded Jackson)
 	@$(call classes_should_not_contain,com/launchdarkly/shaded/com/fasterxml/jackson,shaded Jackson)
 	@$(call classes_should_not_contain,com/launchdarkly/shaded/org/slf4j,shaded SLF4j)
+	@$(call should_not_have_module_info)
 	@$(call manifest_should_not_have_classpath,$<)
 
 test-default-jar-classes: $(SDK_DEFAULT_JAR) $(TEMP_DIR)
@@ -106,6 +108,7 @@ test-default-jar-classes: $(SDK_DEFAULT_JAR) $(TEMP_DIR)
 	@$(call classes_should_not_contain,com/fasterxml/jackson,unshaded Jackson)
 	@$(call classes_should_not_contain,com/launchdarkly/shaded/com/fasterxml/jackson,shaded Jackson)
 	@$(call classes_should_not_contain,org/slf4j,unshaded SLF4j)
+	@$(call should_not_have_module_info)
 	@$(call manifest_should_not_have_classpath,$<)
 
 test-thin-jar-classes: $(SDK_THIN_JAR) $(TEMP_DIR)
@@ -114,6 +117,7 @@ test-thin-jar-classes: $(SDK_THIN_JAR) $(TEMP_DIR)
 	@$(call verify_sdk_classes)
 	@echo "    should not contain anything other than SDK classes"
 	@! grep -v "^com/launchdarkly/sdk" $(TEMP_OUTPUT)
+	@$(call should_not_have_module_info)
 	@$(call manifest_should_not_have_classpath,$<)
 
 test-pom: $(POM_XML)