aboutsummaryrefslogtreecommitdiff
path: root/gradle-plugin
diff options
context:
space:
mode:
authorTing-Yuan Huang <laszio@google.com>2022-04-07 01:36:23 -0700
committerlaszio <ting-yuan@users.noreply.github.com>2022-04-07 13:59:58 -0700
commita4281c119ee50184ea64daa315ef07c7b0e8e267 (patch)
treeeca7d7f9e015066e73e655a1dcfc4a23718e64db /gradle-plugin
parent0db4ec8ad93d22c55ef4c32ae3d4c397be5d6fe2 (diff)
downloadksp-a4281c119ee50184ea64daa315ef07c7b0e8e267.tar.gz
Fix windows paths in gradle-plugin/src/test
Diffstat (limited to 'gradle-plugin')
-rw-r--r--gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt7
-rw-r--r--gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestConfig.kt2
-rw-r--r--gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt15
3 files changed, 14 insertions, 10 deletions
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt
index 0542c3ca..6c82b31f 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/SourceSetConfigurationsTest.kt
@@ -30,6 +30,7 @@ import com.google.devtools.ksp.symbol.KSClassDeclaration
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
+import java.io.File
class SourceSetConfigurationsTest {
@Rule
@@ -200,6 +201,8 @@ class SourceSetConfigurationsTest {
val variantName: String,
val path: String
)
+
+ fun String.normalizePath() = replace(File.separatorChar, '/')
// parse output to get variant names and sources
// variant name -> list of sources
val variantSources = mutableListOf<SourceFolder>()
@@ -213,7 +216,7 @@ class SourceSetConfigurationsTest {
variantSources.add(
SourceFolder(
variantName = currentVariantName,
- path = line
+ path = line.normalizePath()
)
)
}
@@ -222,7 +225,7 @@ class SourceSetConfigurationsTest {
variantSources.add(
SourceFolder(
variantName = currentVariantName,
- path = line
+ path = line.normalizePath()
)
)
}
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestConfig.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestConfig.kt
index 5c21ee28..1c048da6 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestConfig.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestConfig.kt
@@ -58,6 +58,8 @@ data class TestConfig(
kspProjectProperties["agpBaseVersion"] as String
}
+ val mavenRepoPath = mavenRepoDir.path.replace(File.separatorChar, '/')
+
companion object {
/**
* Loads the test configuration from resources.
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt
index ee619f61..95bd8f72 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt
@@ -36,12 +36,11 @@ class TestProject(
)
)
// add gradle-plugin test classpath as a dependency to be able to load processors.
- it.dependencies.add(
- DependencyDeclaration.files(
- "implementation",
- testConfig.processorClasspath
+ testConfig.processorClasspath.split(File.pathSeparatorChar).forEach { path ->
+ it.dependencies.add(
+ DependencyDeclaration.files("implementation", path.replace(File.separatorChar, '/'))
)
- )
+ }
}
val appModule = TestModule(
@@ -61,7 +60,7 @@ class TestProject(
include("app")
pluginManagement {
repositories {
- maven("${testConfig.mavenRepoDir}")
+ maven("${testConfig.mavenRepoPath}")
gradlePluginPortal()
google()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/")
@@ -90,7 +89,7 @@ class TestProject(
appendln(
"""
repositories {
- maven("${testConfig.mavenRepoDir}")
+ maven("${testConfig.mavenRepoPath}")
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/")
google()
@@ -104,7 +103,7 @@ class TestProject(
}
subprojects {
repositories {
- maven("${testConfig.mavenRepoDir}")
+ maven("${testConfig.mavenRepoPath}")
mavenCentral()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/")
google()