Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration Test setup: fix relative path error for Android SDK #102

Merged
merged 3 commits into from
Jun 27, 2023
Merged

Integration Test setup: fix relative path error for Android SDK #102

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87614f2
fix relative path error for Android SDK
aSemy Jun 26, 2023
efaeb02
remove relative path, use `IgnoredPathInputNormalizer`
aSemy Jun 26, 2023
dc4fad4
mark Android SDK dir as a 'dir' input, not a 'file' input
aSemy Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 14 additions & 26 deletions buildSrc/src/main/kotlin/buildsrc/conventions/android-setup.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package buildsrc.conventions

import buildsrc.tasks.SetupDokkaProjects
import java.io.File
import java.time.Duration
import org.gradle.api.provider.Provider
import org.gradle.kotlin.dsl.*
import buildsrc.utils.skipTestFixturesPublications
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.internal.fingerprint.IgnoredPathInputNormalizer
import org.jetbrains.kotlin.util.suffixIfNot


Expand All @@ -27,18 +21,15 @@ val androidSdkDir: Provider<File> = providers
.orElse(layout.projectDirectory.file("projects/ANDROID_SDK").asFile)



val createAndroidLocalPropertiesFile by tasks.registering {

val localPropertiesFile = temporaryDir.resolve("local.properties")
outputs.file(localPropertiesFile).withPropertyName("localPropertiesFile")

val androidSdkDir = androidSdkDir
// add the relative path as a property for Gradle up-to-date checks (the directory contents don't matter)
inputs.property(
"androidSdkDirPath",
androidSdkDir.map { it.relativeTo(projectDir).invariantSeparatorsPath }
)
inputs.dir(androidSdkDir)
.withPropertyName("androidSdkDir")
.withNormalizer(IgnoredPathInputNormalizer::class)

doLast {
val androidSdkPath = androidSdkDir.get().invariantSeparatorsPath
Expand All @@ -62,26 +53,24 @@ val createAndroidLocalPropertiesFile by tasks.registering {
val updateAndroidLocalProperties by tasks.registering {

// find all local.properties files
val localPropertiesFiles = layout.projectDirectory.dir("projects").asFileTree
.matching {
include("**/local.properties")
}.files
val localPropertiesFiles = layout.projectDirectory.dir("projects")
.asFileTree
.matching { include("**/local.properties") }
.files

outputs.files(localPropertiesFiles).withPropertyName("localPropertiesFiles")

val androidSdkDir = androidSdkDir

// add the relative path as a property for Gradle up-to-date checks (the directory contents don't matter)
inputs.property(
"androidSdkDirPath",
androidSdkDir.map { it.relativeTo(projectDir).invariantSeparatorsPath }
)
inputs.dir(androidSdkDir)
.withPropertyName("androidSdkDir")
.withNormalizer(IgnoredPathInputNormalizer::class)

doLast {
val androidSdkDirPath = androidSdkDir.get().invariantSeparatorsPath

localPropertiesFiles.forEach { file ->
if (file.exists()) {
localPropertiesFiles
.filter { it.exists() }
.forEach { file ->
file.writeText(
file.useLines { lines ->
lines.joinToString("\n") { line ->
Expand All @@ -93,6 +82,5 @@ val updateAndroidLocalProperties by tasks.registering {
}
)
}
}
}
}