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

Gradle plugin: fix wrong external NotNull annotation

Browse Source
This commit is contained in:
Alexander Udalov
2014-08-10 19:06:09 +04:00
parent 423a48c7c3
commit 991c33d236
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml
-3
View File
@@ -8,9 +8,6 @@
<val name="value" val="&quot;fun apply(p0 : T) : Unit&quot;" /> <val name="value" val="&quot;fun apply(p0 : T) : Unit&quot;" />
</annotation> </annotation>
</item> </item>
<item name='org.gradle.api.Project org.gradle.api.Project getParent()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name="org.gradle.api.Project org.gradle.api.file.ConfigurableFileCollection files(java.lang.Object...)"> <item name="org.gradle.api.Project org.gradle.api.file.ConfigurableFileCollection files(java.lang.Object...)">
<annotation name="org.jetbrains.annotations.NotNull" /> <annotation name="org.jetbrains.annotations.NotNull" />
</item> </item>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
+1 -2
View File
@@ -4,7 +4,6 @@ import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.dsl.DependencyHandler import org.gradle.api.artifacts.dsl.DependencyHandler
import org.gradle.api.artifacts.ConfigurationContainer import org.gradle.api.artifacts.ConfigurationContainer
import org.gradle.api.artifacts.Dependency
import org.gradle.api.specs.Spec import org.gradle.api.specs.Spec
import java.io.File import java.io.File
import java.net.URL import java.net.URL
@@ -79,7 +78,7 @@ abstract class KotlinBasePluginWrapper: Plugin<Project> {
return scriptHandler return scriptHandler
} }
log.debug("not found, switching to parent") log.debug("not found, switching to parent")
curProject = curProject.getParent() curProject = curProject.getParent()!!
} }
return null return null
} }