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

Gradle plugin: add compatibility with android-gradle-plugin 0.10.+

Browse Source 
#KT-4984 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-05-12 19:08:24 +04:00
parent 35802640cb
commit da4e62e4be
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/pom.xml
+41
View File
@@ -73,6 +73,12 @@
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -90,9 +96,38 @@
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
<directory>${project.build.outputDirectory}/../groovyOutput</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.5</version>
<configuration>
<providerSelection>2.0</providerSelection>
<source/>
</configuration>
<executions>
<execution>
<phase>process-sources</phase>
<goals> <goal>compile</goal></goals>
<configuration>
<sources>
<fileset>
<directory>${project.basedir}/src/main/kotlin</directory>
<includes>
<include>**/*.groovy</include>
</includes>
</fileset>
</sources>
<outputDirectory>${project.build.outputDirectory}/../groovyOutput</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
@@ -108,6 +143,12 @@
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.build.outputDirectory}/../groovyOutput</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>