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

Replace bunch copies for some of build.gradle.kts files with a DSL

Browse Source
This commit is contained in:
Yan Zhulanow
2018-09-25 20:20:27 +03:00
parent 81cfc3e39f
commit ba53ba37b0
31 changed files with 193 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-jps/build.gradle.kts
+16 -4
View File
@@ -10,7 +10,10 @@ dependencies {
compile(project(":compiler:util"))
compile(project(":jps-plugin"))
compile(project(":plugins:android-extensions-compiler"))
compileOnly(intellijDep()) { includeJars("openapi", "platform-api", "jps-builders", "jps-model", "jdom") }
compileOnly(intellijDep()) { includeJars("openapi", "jps-builders", "jps-model", "jdom") }
Platform[181].orHigher {
compileOnly(intellijDep()) { includeJars("platform-api") }
}
compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
@@ -23,14 +26,23 @@ dependencies {
testCompileOnly(intellijDep()) { includeJars("jps-model") }
testRuntime(intellijPluginDep("android"))
testRuntime(intellijPluginDep("smali"))
(Platform[181].orHigher.or(Ide.AS31)) {
testRuntime(intellijPluginDep("smali"))
}
testRuntime(intellijDep("jps-build-test"))
testRuntime(intellijDep("jps-standalone"))
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
Ide.IJ {
"main" { projectDefault() }
"test" { projectDefault() }
}
Ide.AS {
"main" {}
"test" {}
}
}
projectTest {
plugins/android-extensions/android-extensions-jps/build.gradle.kts.173
-40
View File
@@ -1,40 +0,0 @@
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(commonDep("junit:junit"))
testCompile(project(":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(intellijDep("jps-build-test"))
testRuntime(intellijDep("jps-standalone"))
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
projectTest {
workingDir = rootDir
useAndroidSdk()
}
testsJar {}
plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31
-41
View File
@@ -1,41 +0,0 @@
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(commonDep("junit:junit"))
testCompile(project(":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 {}
plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33
-41
View File
@@ -1,41 +0,0 @@
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", "platform-api", "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(commonDep("junit:junit"))
testCompile(project(":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" {}
"test" {}
}
projectTest {
workingDir = rootDir
useAndroidSdk()
}
testsJar {}