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

Misc: Fix Android SDK path in Gradle import tests

Browse Source
This commit is contained in:
Alexey Sedunov
2018-02-01 18:50:07 +03:00
parent 7995ae05c5
commit d51da8bafd
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+2 -2
View File
@@ -471,7 +471,7 @@ class MultiplatformProjectImportingTest : GradleImportingTestCase() {
}
""")
createProjectSubFile("local.properties", """
sdk.dir=/${KotlinTestUtils.findAndroidSdk()}
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
""")
@@ -649,7 +649,7 @@ class MultiplatformProjectImportingTest : GradleImportingTestCase() {
}
""")
createProjectSubFile("local.properties", """
sdk.dir=/${KotlinTestUtils.findAndroidSdk()}
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
""")
importProject()
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+3 -2
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.impl.libraries.LibraryEx
import com.intellij.openapi.util.text.StringUtil
import com.intellij.util.PathUtil
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
@@ -1109,7 +1110,7 @@ compileTestKotlin {
include ':js-module'
""")
createProjectSubFile("local.properties", """
sdk.dir=/${KotlinTestUtils.findAndroidSdk()}
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
""")
importProject()
@@ -1178,7 +1179,7 @@ compileTestKotlin {
}
""")
createProjectSubFile("local.properties", """
sdk.dir=/${KotlinTestUtils.findAndroidSdk()}
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
""")
createProjectSubFile("src/main/AndroidManifest.xml", """
<manifest xmlns:android="http://schemas.android.com/apk/res/android"