From 56f80814278b74e456967b2e54fc25adb5c3dcfb Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Sun, 21 Aug 2022 22:47:12 +0200 Subject: [PATCH] Ensure to run both (#59) --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6982b82..dd3b215 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,9 @@ plugins { id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false id 'com.diffplug.spotless' version '6.7.2' apply false } -if (verifySettingsGradle() || verifyGitAttributes()) +boolean settingsupdated = verifySettingsGradle() +settingsupdated = verifyGitAttributes() || settingsupdated +if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") dependencies { @@ -708,7 +710,9 @@ boolean performBuildScriptUpdate(String projectDir) { def buildscriptFile = getFile("build.gradle") availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } } out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!") - if (verifySettingsGradle() || verifyGitAttributes()) + boolean settingsupdated = verifySettingsGradle() + settingsupdated = verifyGitAttributes() || settingsupdated + if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") return true }