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

Fix after rebase on master

Browse Source
This commit is contained in:
Ilya Chernikov
2017-08-31 21:36:31 +03:00
parent b4c9422376
commit 0676ebd530
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/project-schema.json
+14 -9
View File
@@ -503,8 +503,7 @@
":kotlin-annotation-processing": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention",
"maven": "org.gradle.api.plugins.MavenPluginConvention"
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
@@ -523,7 +522,6 @@
"runtimeElements",
"runtimeJar",
"runtimeOnly",
"signatures",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
@@ -538,14 +536,14 @@
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension",
"signing": "org.gradle.plugins.signing.SigningExtension"
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":kotlin-annotation-processing-gradle": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
"java": "org.gradle.api.plugins.JavaPluginConvention",
"maven": "org.gradle.api.plugins.MavenPluginConvention"
},
"configurations": [
"apiElements",
@@ -558,11 +556,13 @@
"implementation",
"kapt",
"kaptTest",
"packedJars",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeJar",
"runtimeOnly",
"signatures",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
@@ -576,7 +576,8 @@
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
"reporting": "org.gradle.api.reporting.ReportingExtension",
"signing": "org.gradle.plugins.signing.SigningExtension"
}
},
":kotlin-ant": {
@@ -3722,17 +3723,21 @@
},
":prepare:kotlin-plugin": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"archives",
"buildVersion",
"default",
"packedJars",
"runtimeJar",
"sideJars"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":prepare:mock-runtime-for-test": {