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

Replace android sdk dependencies with custom project build, cleanup update_dependencies.xml

Browse Source
This commit is contained in:
Ilya Chernikov
2017-11-15 18:50:21 +01:00
committed by Vyacheslav Gerasimov
parent 98204aa2d3
commit 0b63e11ea8
19 changed files with 184 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+1
View File
@@ -58,6 +58,7 @@ testsJar {}
projectTest {
dependsOn(":kotlin-android-extensions-runtime:dist")
workingDir = rootDir
systemProperty("android.sdk", androidSdkPath())
}
runtimeJar()
plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractParcelQuickFixTest.kt
+3 -1
View File
@@ -18,13 +18,15 @@ package org.jetbrains.kotlin.android
import org.jetbrains.kotlin.android.quickfix.AbstractAndroidQuickFixMultiFileTest
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
abstract class AbstractParcelQuickFixTest : AbstractAndroidQuickFixMultiFileTest() {
override fun setUp() {
super.setUp()
val androidJarDir = File("dependencies/androidSDK/platforms").listFiles().first { it.name.startsWith("android-") }
val androidSdk = KotlinTestUtils.findAndroidSdk()
val androidJarDir = File(androidSdk, "platforms").listFiles().first { it.name.startsWith("android-") }
ConfigLibraryUtil.addLibrary(myModule, "androidJar", androidJarDir.absolutePath, arrayOf("android.jar"))
ConfigLibraryUtil.addLibrary(myModule, "androidExtensionsRuntime", "dist/kotlinc/lib", arrayOf("android-extensions-runtime.jar"))
plugins/android-extensions/android-extensions-jps/test/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jps.android.model.JpsAndroidSdkType
import org.jetbrains.jps.model.impl.JpsSimpleElementImpl
import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.kotlin.jps.build.BaseKotlinJpsBuildTestCase
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() {
@@ -42,7 +43,7 @@ abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() {
val jdkName = "java_sdk"
addJdk(jdkName)
val properties = JpsAndroidSdkProperties("android-23", jdkName)
val sdkPath = homePath + "/../dependencies/androidSDK"
val sdkPath = KotlinTestUtils.findAndroidSdk().canonicalPath
val library = myModel.global.addSdk(SDK_NAME, sdkPath, "", JpsAndroidSdkType.INSTANCE, JpsSimpleElementImpl(properties))
library.addRoot(File(sdkPath + "/platforms/android-23/android.jar"), JpsOrderRootType.COMPILED)
return library.properties