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

Commit

Permalink
prepare 5.6.6 release (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
LaunchDarklyReleaseBot authored Jan 7, 2022
1 parent 5c90bd5 commit db43071
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions packaging-test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit db43071

Please sign in to comment.