Implement feedback

gradle · Aug 23, 2023 · b9cb2f6 · b9cb2f6
1 parent 471e818
commit b9cb2f6
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 30 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,6 +37,7 @@ val isDevelopmentRelease = !hasProperty("finalRelease")
 val releaseVersion = releaseVersion()
 val releaseNotes = releaseNotes()
 val distributionVersion = distributionVersion()
+val buildScanSummaryVersion = "0.9-2023.2"
 
 allprojects {
     version = releaseVersion.get()
@@ -46,8 +47,6 @@ val argbash by configurations.creating
 val commonComponents by configurations.creating
 val mavenComponents by configurations.creating
 
-val buildScanSummaryVersion = "1.0-2023.2"
-
 dependencies {
     argbash("argbash:argbash:2.10.0@zip")
     commonComponents("com.gradle.enterprise:build-scan-summary:${buildScanSummaryVersion}")
@@ -97,8 +96,9 @@ val copyGradleScripts by tasks.registering(Copy::class) {
 
     // local variable required for configuration cache compatibility
     // https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:not_yet_implemented:accessing_top_level_at_execution
-    val buildScanSummaryVersion = buildScanSummaryVersion
     val releaseVersion = releaseVersion
+    val buildScanSummaryVersion = buildScanSummaryVersion
+
     inputs.property("project.version", releaseVersion)
 
     from(layout.projectDirectory.file("LICENSE"))
@@ -138,8 +138,9 @@ val copyMavenScripts by tasks.registering(Copy::class) {
 
     // local variable required for configuration cache compatibility
     // https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:not_yet_implemented:accessing_top_level_at_execution
-    val buildScanSummaryVersion = buildScanSummaryVersion
     val releaseVersion = releaseVersion
+    val buildScanSummaryVersion = buildScanSummaryVersion
+
     inputs.property("project.version", releaseVersion)
 
     from(layout.projectDirectory.file("LICENSE"))

diff --git a/components/scripts/gradle/01-validate-incremental-building.sh b/components/scripts/gradle/01-validate-incremental-building.sh
@@ -40,10 +40,6 @@ ge_server=''
 interactive_mode=''
 
 main() {
-  if [[ "$build_scan_publishing_mode" == "off" ]]; then
-    verify_offline_mode_required_files_exist
-  fi
-
   if [ "${interactive_mode}" == "on" ]; then
     wizard_execute
   else

diff --git a/components/scripts/gradle/02-validate-local-build-caching-same-location.sh b/components/scripts/gradle/02-validate-local-build-caching-same-location.sh
@@ -40,10 +40,6 @@ ge_server=''
 interactive_mode=''
 
 main() {
-  if [[ "$build_scan_publishing_mode" == "off" ]]; then
-    verify_offline_mode_required_files_exist
-  fi
-
   if [ "${interactive_mode}" == "on" ]; then
     wizard_execute
   else

diff --git a/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh b/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh
@@ -40,10 +40,6 @@ ge_server=''
 interactive_mode=''
 
 main() {
-  if [[ "$build_scan_publishing_mode" == "off" ]]; then
-    verify_offline_mode_required_files_exist
-  fi
-
   if [ "${interactive_mode}" == "on" ]; then
     wizard_execute
   else

diff --git a/components/scripts/lib/build-scan-offline.sh b/components/scripts/lib/build-scan-offline.sh
@@ -4,12 +4,6 @@ readonly READ_BUILD_SCAN_DATA_JAR="${LIB_DIR}/build-scan-clients/build-scan-summ
 
 build_scan_dumps=()
 
-verify_offline_mode_required_files_exist() {
-  if [ ! -f "$READ_BUILD_SCAN_DATA_JAR" ]; then
-    die "ERROR: Missing required file to read the build scan data" "${INVALID_INPUT}"
-  fi
-}
-
 find_and_read_build_scan_dumps() {
   find_build_scan_dumps
   read_build_scan_dumps

diff --git a/components/scripts/maven/01-validate-local-build-caching-same-location.sh b/components/scripts/maven/01-validate-local-build-caching-same-location.sh
@@ -39,10 +39,6 @@ ge_server=''
 interactive_mode=''
 
 main() {
-  if [[ "$build_scan_publishing_mode" == "off" ]]; then
-    verify_offline_mode_required_files_exist
-  fi
-
   if [ "${interactive_mode}" == "on" ]; then
     wizard_execute
   else

diff --git a/components/scripts/maven/02-validate-local-build-caching-different-locations.sh b/components/scripts/maven/02-validate-local-build-caching-different-locations.sh
@@ -39,10 +39,6 @@ ge_server=''
 interactive_mode=''
 
 main() {
-  if [[ "$build_scan_publishing_mode" == "off" ]]; then
-    verify_offline_mode_required_files_exist
-  fi
-
   if [ "${interactive_mode}" == "on" ]; then
     wizard_execute
   else