small fixes

Author: Mr3zee

gradle-plugin/build.gradle.kts

@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import util.other.generateSource
 import kotlin.io.path.Path
 import kotlin.io.path.absolutePathString
+import kotlin.io.path.exists
 import kotlin.io.path.readLines
 
 plugins {
@@ -109,9 +110,11 @@ generateSource(
 val globalRootDir: String by extra
 
 val androidHome = System.getenv("ANDROID_HOME")
+    ?: System.getProperty("ANDROID_SDK_HOME")
     ?: Path(globalRootDir, "local.properties")
-        .readLines()
-        .find { it.startsWith("sdk.dir=") }
+        .takeIf { it.exists() }
+        ?.readLines()
+        ?.find { it.startsWith("sdk.dir=") }
         ?.substringAfter("=")
         ?.trim()
     ?: error("ANDROID_HOME is not set")

gradle-plugin/src/test/kotlin/kotlinx/rpc/base/BaseTest.kt

@@ -168,13 +168,11 @@ abstract class BaseTest {
             .withProjectDir(projectDir.absolute().toFile())
             .withTestKitDir(testKitDir.absolute().toFile())
             .withGradleVersion(versions.gradle)
-            .forwardOutput()
             .withEnvironment(mapOf("ANDROID_HOME" to ANDROID_HOME_DIR))
             .withArguments(
                 listOfNotNull(
                     task,
                     "--stacktrace",
-                    "--info",
                     "-Dorg.gradle.kotlin.dsl.scriptCompilationAvoidance=false",
                     *args,
                 )
@@ -192,15 +190,13 @@ abstract class BaseTest {
         val versions: VersionsEnv,
     ) {
         val projectDir: Path get() = this@BaseTest.projectDir
-        var latestBuild: BuildResult? = null
-            private set
 
         fun runGradle(
             task: String,
             vararg args: String,
         ): BuildResult {
             return runGradleInternal(task, versions, *args) {
-                build().also { latestBuild = it }
+                build()
             }
         }
 
@@ -209,7 +205,7 @@ abstract class BaseTest {
             vararg args: String,
         ): BuildResult {
             return runGradleInternal(task, versions, *args) {
-                buildAndFail().also { latestBuild = it }
+                buildAndFail()
             }
         }