Switch robolectric usages to regular dependency
This commit is contained in:
committed by
Vyacheslav Gerasimov
parent
361d8536ac
commit
12f0f019da
@@ -128,6 +128,7 @@ extra["versions.kotlinx-coroutines-jdk8"] = "0.14.1"
|
||||
extra["versions.json"] = "20160807"
|
||||
extra["versions.native-platform"] = "0.14"
|
||||
extra["versions.ant-launcher"] = "1.8.0"
|
||||
extra["versions.robolectric"] = "3.1"
|
||||
|
||||
val markdownVer = "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin"
|
||||
extra["markdownParserRepo"] = "https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/$markdownVer/([artifact]_[ext]/)[artifact](.[ext])"
|
||||
|
||||
+4
-2
@@ -115,8 +115,10 @@ abstract class AbstractParcelBoxTest : CodegenTestCase() {
|
||||
val kotlinRuntimeJar = PathUtil.kotlinPathsForIdeaPlugin.stdlibPath
|
||||
val layoutLibJars = listOf(File(androidPluginPath, "layoutlib.jar"), File(androidPluginPath, "layoutlib-api.jar"))
|
||||
|
||||
val robolectricJars = File("dependencies/robolectric")
|
||||
.listFiles { f: File -> f.extension == "jar" }
|
||||
val robolectricClasspath = System.getProperty("robolectric.classpath")
|
||||
?: throw RuntimeException("Unable to get a valid classpath from 'robolectric.classpath' property, please set it accordingly")
|
||||
val robolectricJars = robolectricClasspath.split(File.pathSeparator)
|
||||
.map { File(it) }
|
||||
.sortedBy { it.nameWithoutExtension }
|
||||
|
||||
val junitCoreResourceName = JUnitCore::class.java.name.replace('.', '/') + ".class"
|
||||
|
||||
@@ -169,15 +169,6 @@
|
||||
<!-- Javaslang -->
|
||||
<get-maven-library prefix="io/javaslang" lib="javaslang" version="2.0.6"/>
|
||||
|
||||
<get-maven-library-with-dependencies
|
||||
group="org.robolectric"
|
||||
artifact="robolectric"
|
||||
version="3.1"
|
||||
target.dir="robolectric"/>
|
||||
|
||||
<get-maven-library prefix="org/apache/maven" lib="maven-ant-tasks" version="2.1.3"
|
||||
target.jar.name.base="maven-ant-tasks" download="${dependencies}/robolectric" />
|
||||
|
||||
<delete file="${dependencies}/android.jar" failonerror="false"/>
|
||||
<get src="http://dl-ssl.google.com/android/repository/android-19_r02.zip"
|
||||
dest="${dependencies}/download/android-sdk.zip" usetimestamp="true"/>
|
||||
|
||||
Reference in New Issue
Block a user