From e2578b6a17928f07ce1ebda9fef774843a1b1de2 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 24 Jan 2018 21:24:21 +0300 Subject: [PATCH] as31: Add smali plugin required by android plugin to test runtime --- idea/build.gradle.kts.as31 | 1 + idea/idea-android/build.gradle.kts.as31 | 1 + idea/idea-gradle/build.gradle.kts.as31 | 1 + idea/idea-maven/build.gradle.kts.as31 | 1 + j2k/build.gradle.kts.as31 | 1 + .../build.gradle.kts.as31 | 1 + .../build.gradle.kts.as31 | 42 +++++++++++++++++++ 7 files changed, 48 insertions(+) create mode 100644 plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31 index df790f5e333..d622c4789eb 100644 --- a/idea/build.gradle.kts.as31 +++ b/idea/build.gradle.kts.as31 @@ -95,6 +95,7 @@ dependencies { testRuntime(intellijPluginDep("coverage")) //testRuntime(intellijPluginDep("maven")) testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("testng")) } diff --git a/idea/idea-android/build.gradle.kts.as31 b/idea/idea-android/build.gradle.kts.as31 index 58b6a02ab98..fc654ca0a23 100644 --- a/idea/idea-android/build.gradle.kts.as31 +++ b/idea/idea-android/build.gradle.kts.as31 @@ -47,6 +47,7 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("copyright")) testRuntime(intellijPluginDep("coverage")) testRuntime(intellijPluginDep("gradle")) diff --git a/idea/idea-gradle/build.gradle.kts.as31 b/idea/idea-gradle/build.gradle.kts.as31 index bc1450de059..6ed9e321fad 100644 --- a/idea/idea-gradle/build.gradle.kts.as31 +++ b/idea/idea-gradle/build.gradle.kts.as31 @@ -46,6 +46,7 @@ dependencies { testRuntime(intellijPluginDep("coverage")) //testRuntime(intellijPluginDep("maven")) testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) } sourceSets { diff --git a/idea/idea-maven/build.gradle.kts.as31 b/idea/idea-maven/build.gradle.kts.as31 index fc94dc793da..953095ab0bc 100644 --- a/idea/idea-maven/build.gradle.kts.as31 +++ b/idea/idea-maven/build.gradle.kts.as31 @@ -47,6 +47,7 @@ dependencies { testRuntime(intellijPluginDep("coverage")) //testRuntime(intellijPluginDep("maven")) testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) } sourceSets { diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index cbd5700a712..f4bbf636b4f 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -33,6 +33,7 @@ dependencies { testRuntime(intellijPluginDep("coverage")) //testRuntime(intellijPluginDep("maven")) testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 index 0a72e4e82a2..fadabf53858 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 @@ -53,6 +53,7 @@ dependencies { testRuntime(intellijPluginDep("java-decompiler")) //testRuntime(intellijPluginDep("maven")) testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) } sourceSets { diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 new file mode 100644 index 00000000000..712a18454c2 --- /dev/null +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 @@ -0,0 +1,42 @@ + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + testRuntime(intellijDep()) + + compile(project(":compiler:util")) + compile(project(":jps-plugin")) + compile(project(":plugins:android-extensions-compiler")) + compileOnly(intellijDep()) { includeJars("openapi", "jps-builders", "jps-model", "jdom") } + compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } + compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } + + testCompile(projectTests(":jps-plugin")) + testCompile(project(":compiler:tests-common")) + testCompile(commonDep("junit:junit")) + testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(projectTests(":kotlin-build-common")) + testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } + testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } + testCompileOnly(intellijDep()) { includeJars("jps-model") } + + testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) + testRuntime(intellijDep("jps-build-test")) + testRuntime(intellijDep("jps-standalone")) +} + +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir + useAndroidSdk() +} + +testsJar {} \ No newline at end of file