azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc: Fetch Spring libraries to dependencies directory

Browse Source
This commit is contained in:
Alexey Sedunov
2016-03-25 15:08:29 +03:00
parent 00239914fa
commit 2dd83b12d3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
+3 -2
View File
@@ -24,6 +24,7 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.TestFixtureExtension import org.jetbrains.kotlin.idea.test.TestFixtureExtension
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.util.* import java.util.*
@Suppress("unused") @Suppress("unused")
@@ -37,12 +38,12 @@ class SpringTestFixtureExtension() : TestFixtureExtension {
) )
} }
val SPRING_LIBRARY_ROOT = "${PluginTestCaseBase.getTestDataPathBase()}/spring/_lib" val SPRING_LIBRARY_ROOT = "${KotlinTestUtils.getHomeDirectory()}/dependencies/spring"
override fun setUp(module: Module) { override fun setUp(module: Module) {
this.module = module this.module = module
val library = SpringFramework.FRAMEWORK_4_2_0 val library = SpringFramework.FRAMEWORK_4_2_0
val libraryPath = "$SPRING_LIBRARY_ROOT/spring/${library.version}/" val libraryPath = "$SPRING_LIBRARY_ROOT/${library.version}/"
val jarNames = HashSet<String>(library.artifactIds.size) val jarNames = HashSet<String>(library.artifactIds.size)
for (id in library.artifactIds) { for (id in library.artifactIds) {
jarNames.add("spring-$id-${library.version}.jar") jarNames.add("spring-$id-${library.version}.jar")
update_dependencies.xml
+1 -1
View File
@@ -146,7 +146,7 @@
lib="@{lib}" lib="@{lib}"
version="@{version}" version="@{version}"
src="false" src="false"
dependencies="idea/testData/spring/_lib/spring/@{version}"/> dependencies="dependencies/spring/@{version}"/>
</sequential> </sequential>
</macrodef> </macrodef>