Merge pull request #386 from thc202/fix-release

ricekot · web-flow · commit 2d075ff656fb · 2021-10-06T22:24:45.000+05:30
Fix release of add-ons and other tweaks
diff --git a/addOns/addOns.gradle.kts b/addOns/addOns.gradle.kts
@@ -124,12 +124,13 @@ subprojects {
             tagMessage.set(message)
             title.set(message)
         }
+        val zapAddOnExt = project.zapAddOn
         releaseAddOn {
             dependsOn(createReleaseAddOn)
 
             dependsOn(handleRelease)
             dependsOn(createPullRequestNextDevIter)
-            if (project.zapAddOn.addOnId.get() == "help") {
+            if (zapAddOnExt.addOnId.get() == "help") {
                 dependsOn(":addOns:crowdinUploadSourceFiles")
             }
         }
diff --git a/addOns/help/CHANGELOG.md b/addOns/help/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [12] - 2021-10-06
 ### Changed
+- Updated for 2.11.0.
 - Remove extra column in a videos table.
 - Update link to zaproxy and community-scripts repo.
 
diff --git a/addOns/help/gradle.properties b/addOns/help/gradle.properties
@@ -1,2 +1,2 @@
 version=12
-release=true
+release=false

Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,13 @@ subprojects {`
`124`	`124`	`tagMessage.set(message)`
`125`	`125`	`title.set(message)`
`126`	`126`	`}`
	`127`	`+ val zapAddOnExt = project.zapAddOn`
`127`	`128`	`releaseAddOn {`
`128`	`129`	`dependsOn(createReleaseAddOn)`
`129`	`130`
`130`	`131`	`dependsOn(handleRelease)`
`131`	`132`	`dependsOn(createPullRequestNextDevIter)`
`132`		`- if (project.zapAddOn.addOnId.get() == "help") {`
	`133`	`+ if (zapAddOnExt.addOnId.get() == "help") {`
`133`	`134`	`dependsOn(":addOns:crowdinUploadSourceFiles")`
`134`	`135`	`}`
`135`	`136`	`}`