Skip to content

Commit b5d6851

Browse files
committed
Fix path to android-extensions-runtime in ParcelBoxTest
1 parent 4549cc7 commit b5d6851

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

plugins/plugins-tests/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ sourceSets {
3838

3939
testsJar {}
4040

41+
evaluationDependsOn(":kotlin-android-extensions-runtime")
42+
4143
projectTest {
44+
environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
4245
dependsOnTaskIfExistsRec("dist", project = rootProject)
4346
workingDir = rootDir
4447
}

plugins/plugins-tests/tests/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,12 @@ abstract class AbstractParcelBoxTest : CodegenTestCase() {
117117
val junitCoreResourceName = JUnitCore::class.java.name.replace('.', '/') + ".class"
118118
val junitJar = File(JUnitCore::class.java.classLoader.getResource(junitCoreResourceName).file.substringBeforeLast('!'))
119119

120-
val androidExtensionsRuntime = File("out/production/android-extensions-runtime")
120+
val androidExtensionsRuntimeCP =
121+
(System.getenv("ANDROID_EXTENSIONS_RUNTIME_CLASSES")?.split(File.pathSeparator)
122+
?: listOf("out/production/android-extensions-runtime")
123+
).map { File(it) }
121124

122-
return listOf(kotlinRuntimeJar) + layoutLibJars + robolectricJars + junitJar + androidExtensionsRuntime
125+
return listOf(kotlinRuntimeJar) + layoutLibJars + robolectricJars + junitJar + androidExtensionsRuntimeCP
123126
}
124127

125128
override fun doMultiFileTest(wholeFile: File, files: List<TestFile>, javaFilesDir: File?) {

0 commit comments

Comments
 (0)