chore: minor changes

Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>

Author: ale5000-git

build.gradle

@@ -32,6 +32,7 @@ configure(project) {
         lazyVersion = moduleProps.map { it.getProperty('version', 'v0.0.0-unknown').trim().toLowerCase(Locale.ROOT) }
         lazyGroup = moduleProps.map { it.getProperty('group', 'unknown').trim() }
         lazyProjectId = moduleProps.map { it.getProperty('id', '').trim() }
+        lazyOsName = providers.systemProperty('os.name')
     }
 
     if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
@@ -41,32 +42,39 @@ configure(project) {
 
 /* ===HEADER=== */
 
-interface HeaderParams extends FlowParameters {
+interface HeaderParams extends ValueSourceParameters {
     @Input Property<String> getProjectName()
     @Input Property<String> getVersion()
+    @Input Property<String> getOsName()
 }
 
-abstract class HeaderAction implements FlowAction<HeaderParams> {
-    private static final log = Logging.getLogger(HeaderAction)
+abstract class HeaderPrinter implements ValueSource<String, HeaderParams> {
+    private static final log = Logging.getLogger(HeaderPrinter)
 
-    void execute(FlowParameters p) {
+    @Override String obtain() {
         log.lifecycle '=' * 36
-        log.lifecycle "Project: ${p.projectName.get()}"
-        log.lifecycle "Version: ${p.version.get()}"
-        log.lifecycle "OS:      ${System.getProperty('os.name')}"
+        log.lifecycle "Project: ${parameters.projectName.get()}"
+        log.lifecycle "Version: ${parameters.version.get()}"
+        log.lifecycle "OS:      ${parameters.osName.get()}"
         log.lifecycle '=' * 36
+        ''
     }
 }
 
-services.get(FlowScope).always(HeaderAction) {
-    parameters.projectName.set(project.name)
-    parameters.version.set(ext.lazyVersion)
+def headerTrigger = providers.of(HeaderPrinter) {
+    parameters.projectName.set project.name
+    parameters.version.set ext.lazyVersion
+    parameters.osName.set ext.lazyOsName
+}
+
+gradle.taskGraph.whenReady {
+    { headerTrigger.get() }
 }
 
 /* ===FUNCTIONS=== */
 
-private static String getScriptExt() {
-    System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows') ? '.bat' : '.sh'
+private Provider<String> getScriptExt() {
+    ext.lazyOsName.map { it.toLowerCase(Locale.ROOT).contains('windows') ? '.bat' : '.sh' }
 }
 
 private Provider<String> getMavenVersion() {
@@ -101,7 +109,7 @@ private Provider<String> getZipName(String variant = '*') {
     if(!keystorePropsFile.exists()) return
     if(android == null) throw new GradleException('android is null inside configureSigning()')
 
-    println 'Signed build'
+    logger.lifecycle 'Signed build'
 
     Properties keystoreProps = new Properties()
     keystoreProps.load(new FileInputStream(keystorePropsFile))
@@ -132,7 +140,7 @@ private Provider<String> getZipName(String variant = '*') {
 /* ===BLOCKS=== */
 
 base {
-    archivesName.set(getProjectId())
+    archivesName.set getProjectId()
 }
 
 project.afterEvaluate {
@@ -183,14 +191,13 @@ tasks.register('distClean') {
     dependsOn tasks.named('clean'), tasks.named('cleanCache')
 
     doLast {
-        def gitDir = layout.projectDirectory.dir('.git').asFile
-        if(gitDir.exists()) {
+        if (layout.projectDirectory.dir('.git').asFile.exists()) {
             exec {
                 commandLine 'git', 'clean', '-xdf'
                 ignoreExitValue = true
             }
         } else {
-            logger.warn('WARNING: Skipping git clean: .git directory not found.')
+            logger.warn 'WARNING: Skipping git clean: .git directory not found.'
         }
     }
 }
@@ -211,15 +218,15 @@ tasks.register('buildOta', Exec) {
     outputs.file(layout.buildDirectory.file(getZipName('full')))
 
     workingDir = layout.projectDirectory
-    executable = layout.projectDirectory.file("build${getScriptExt()}")
+    executable = "${-> layout.projectDirectory.file("build${getScriptExt().get()}") }"
 
     environment([
         'BUILD_TYPE': 'full',
         'NO_PAUSE'  : '1'
     ])
 
     doFirst {
-        println 'Building the flashable zip with Gradle...'
+        logger.lifecycle 'Building the flashable zip with Gradle...'
     }
 }
 
@@ -239,15 +246,15 @@ tasks.register('buildOtaOSS', Exec) {
     outputs.file(layout.buildDirectory.file(getZipName('oss')))
 
     workingDir = layout.projectDirectory
-    executable = layout.projectDirectory.file("build${getScriptExt()}")
+    executable = "${-> layout.projectDirectory.file("build${getScriptExt().get()}") }"
 
     environment([
         'BUILD_TYPE': 'oss',
         'NO_PAUSE'  : '1'
     ])
 
     doFirst {
-        println 'Building the flashable zip (open-source components only) with Gradle...'
+        logger.lifecycle 'Building the flashable zip (open-source components only) with Gradle...'
     }
 }
 
@@ -288,7 +295,7 @@ tasks.named('wrapper') {
     distributionSha256Sum = gradleSha256Sum
 
     doFirst {
-        logger.lifecycle("Gradle: ${gradleVersionTarget}")
+        logger.lifecycle "Gradle: ${gradleVersionTarget}"
     }
 }
 

settings.gradle

@@ -8,10 +8,13 @@ pluginManagement {
 
 plugins { id 'com.gradle.develocity' }
 
-develocity.buildScan {
-    termsOfUseUrl.set 'https://gradle.com/help/legal-terms-of-use'
-    termsOfUseAgree.set 'yes'
-    publishing.onlyIf { providers.environmentVariable('UPLOAD_BUILD_SCAN').getOrElse('').toBoolean() }
-}
+rootProject.name = 'Google sync add-on'
 
-rootProject.name = 'microG unofficial installer'
+// Initialize the provider early to ensure compatibility with the Gradle configuration cache
+providers.environmentVariable('UPLOAD_BUILD_SCAN').with { uploadBuildScan ->
+    develocity.buildScan {
+        termsOfUseUrl.set 'https://gradle.com/help/legal-terms-of-use'
+        termsOfUseAgree.set 'yes'
+        publishing.onlyIf { uploadBuildScan.getOrElse('').toBoolean() }
+    }
+}