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

[Gradle, CocoaPods] Improved CocoaPods Integration features with tests

Browse Source
This commit is contained in:
Yaroslav Chernyshev
2020-06-19 17:56:02 +03:00
parent 130987fa1e
commit c638043aee
59 changed files with 1535 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/cocoapods/KotlinCocoaPodsModelResolver.kt
+5 -1
View File
@@ -11,6 +11,11 @@ import org.jetbrains.plugins.gradle.model.ProjectImportModelProvider
import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
class KotlinCocoaPodsModelResolver : AbstractProjectResolverExtension() {
override fun requiresTaskRunning(): Boolean = true
override fun getToolingExtensionsClasses(): Set<Class<out Any>> {
return setOf(EnablePodImportTask::class.java)
}
override fun getProjectsLoadedModelProvider(): ProjectImportModelProvider {
return ClassSetProjectImportModelProvider(
@@ -18,7 +23,6 @@ class KotlinCocoaPodsModelResolver : AbstractProjectResolverExtension() {
)
}
override fun requiresTaskRunning(): Boolean = true
}
idea/kotlin-gradle-tooling/src/KotlinCocoaPodsModelBuilder.kt
+2 -1
View File
@@ -21,7 +21,8 @@ class KotlinCocoaPodsModelBuilder : AbstractModelBuilderService() {
override fun buildAll(modelName: String, project: Project, context: ModelBuilderContext): Any? {
val startParameter = project.gradle.startParameter
val taskNames = startParameter.taskNames
val taskNames = mutableListOf<String>()
taskNames.addAll(startParameter.taskNames)
if (project.tasks.findByPath(POD_IMPORT_TASK_NAME) != null && POD_IMPORT_TASK_NAME !in taskNames) {
taskNames.add(POD_IMPORT_TASK_NAME)
idea/resources/META-INF/gradle-java.xml
+1
View File
@@ -15,6 +15,7 @@
<projectResolve implementation="org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModelResolver" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.cocoapods.KotlinCocoaPodsModelResolver" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.commonizer.KotlinCommonizerModelResolver" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.cocoapods.KotlinCocoaPodsModelResolver" order="last"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleProjectResolverExtension" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleCoroutineDebugProjectResolver" order="last"/>
<projectResolve implementation="org.jetbrains.kotlin.kapt.idea.KaptProjectResolverExtension" order="last"/>
idea/resources/META-INF/gradle-java.xml.201
+1
View File
@@ -11,6 +11,7 @@
<pluginDescriptions implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradlePluginDescription"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModelResolver" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.commonizer.KotlinCommonizerModelResolver" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.cocoapods.KotlinCocoaPodsModelResolver" order="last"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleProjectResolverExtension" order="first"/>
<projectResolve implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleCoroutineDebugProjectResolver" order="last"/>
<projectResolve implementation="org.jetbrains.kotlin.kapt.idea.KaptProjectResolverExtension" order="last"/>