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

Move resources: fix copy-resources kotlin compiler maven plugins

Browse Source
This commit is contained in:
Sergey Rostov
2018-11-28 14:51:03 +03:00
parent 2fac72cd99
commit 5237079c5d
5 changed files with 173 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-annotation-processing-maven/pom.xml
+131 -159
View File
@@ -3,169 +3,141 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.version>3.0.4</maven.version>
<annotation-processing.src>${basedir}/../../../plugins/kapt3/kapt3-compiler/src</annotation-processing.src>
<annotation-processing.cli.src>${basedir}/../../../plugins/kapt3/kapt3-cli/src</annotation-processing.cli.src>
<annotation-processing.base.src>${basedir}/../../../plugins/kapt3/kapt3-base/src</annotation-processing.base.src>
<annotation-processing.runtime.src>${basedir}/../../../plugins/kapt3/kapt3-runtime/src</annotation-processing.runtime.src>
<annotation-processing.target-src>${basedir}/target/src/main/kotlin</annotation-processing.target-src>
<annotation-processing.target-src-test>${basedir}/target/src/test/kotlin</annotation-processing.target-src-test>
<annotation-processing.target-resource>${basedir}/target/resource</annotation-processing.target-resource>
</properties>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.version>3.0.4</maven.version>
<annotation-processing.src>${basedir}/../../../plugins/kapt3/kapt3-compiler/src</annotation-processing.src>
<annotation-processing.cli.src>${basedir}/../../../plugins/kapt3/kapt3-cli/src</annotation-processing.cli.src>
<annotation-processing.resources>${basedir}/../../../plugins/kapt3/kapt3-compiler/resources</annotation-processing.resources>
<annotation-processing.base.src>${basedir}/../../../plugins/kapt3/kapt3-base/src</annotation-processing.base.src>
<annotation-processing.runtime.src>${basedir}/../../../plugins/kapt3/kapt3-runtime/src</annotation-processing.runtime.src>
</properties>
<parent>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-annotation-processing-maven</artifactId>
<packaging>jar</packaging>
<description>Annotation Processor wrapper for Kotlin Maven plugin</description>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource><directory>${annotation-processing.resources}</directory></resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<sources>
<source>${annotation-processing.src}</source>
<source>${annotation-processing.cli.src}</source>
<source>${annotation-processing.base.src}</source>
<source>${annotation-processing.runtime.src}</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<version>${project.version}</version>
<configuration>
<jdkHome>${env.JDK_18}</jdkHome>
<annotationPaths>
<annotationPath>${basedir}/kotlinAnnotation</annotationPath>
</annotationPaths>
</configuration>
<artifactId>kotlin-annotation-processing-maven</artifactId>
<packaging>jar</packaging>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals><goal>compile</goal></goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals><goal>test-compile</goal></goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<description>Annotation Processor wrapper for Kotlin Maven plugin</description>
<dependencies>
<profiles>
<profile>
<id>tools_jar_profile</id>
<activation>
<activeByDefault>false</activeByDefault>
<file>
<exists>kotlin-annotation-processing-maven-build.txt</exists>
</file>
</activation>
<properties>
<toolsjar>${env.JDK_18}/lib/tools.jar</toolsjar>
</properties>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.8.0</version>
<scope>system</scope>
<systemPath>${toolsjar}</systemPath>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>${annotation-processing.target-src}</sourceDirectory>
<testSourceDirectory>${annotation-processing.target-src-test}</testSourceDirectory>
<resources>
<resource>
<directory>${annotation-processing.target-resource}</directory>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>copy-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${annotation-processing.target-src}</outputDirectory>
<resources>
<resource><directory>${annotation-processing.src}</directory></resource>
<resource><directory>${annotation-processing.cli.src}</directory></resource>
<resource><directory>${annotation-processing.base.src}</directory></resource>
<resource><directory>${annotation-processing.runtime.src}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${annotation-processing.target-resource}/META-INF</outputDirectory>
<resources>
<resource><directory>${annotation-processing.src}/META-INF</directory></resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<configuration>
<jdkHome>${env.JDK_18}</jdkHome>
<annotationPaths>
<annotationPath>${basedir}/kotlinAnnotation</annotationPath>
</annotationPaths>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${annotation-processing.target-src}</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals> <goal>test-compile</goal> </goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>tools_jar_profile</id>
<activation>
<activeByDefault>false</activeByDefault>
<file>
<exists>kotlin-annotation-processing-maven-build.txt</exists>
</file>
</activation>
<properties>
<toolsjar>${env.JDK_18}/lib/tools.jar</toolsjar>
</properties>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.8.0</version>
<scope>system</scope>
<systemPath>${toolsjar}</systemPath>
</dependency>
</dependencies>
</profile>
</profiles>
</dependencies>
</profile>
</profiles>
</project>
libraries/tools/kotlin-maven-allopen/pom.xml
+10 -38
View File
@@ -7,10 +7,8 @@
<properties>
<maven.version>3.0.5</maven.version>
<allopen.src>${basedir}/../../../plugins/allopen/allopen-cli/src</allopen.src>
<allopen.resources>${basedir}/../../../plugins/allopen/allopen-cli/resources</allopen.resources>
<allopen.maven.plugin.src>${basedir}/src/main/kotlin</allopen.maven.plugin.src>
<allopen.maven.plugin.resources>${basedir}/src/main/resources</allopen.maven.plugin.resources>
<allopen.target-src>${basedir}/target/src/main/kotlin</allopen.target-src>
<allopen.target-resources>${basedir}/target/resource</allopen.target-resources>
</properties>
<parent>
@@ -40,44 +38,23 @@
</dependencies>
<build>
<sourceDirectory>${allopen.target-src}</sourceDirectory>
<resources>
<resource>
<directory>${allopen.target-resources}</directory>
</resource>
<resource><directory>${allopen.resources}</directory></resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<outputDirectory>${allopen.target-src}</outputDirectory>
<resources>
<resource><directory>${allopen.src}</directory></resource>
<resource><directory>${allopen.maven.plugin.src}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${allopen.target-resources}/META-INF</outputDirectory>
<resources>
<resource><directory>${allopen.src}/META-INF</directory></resource>
<resource><directory>${allopen.maven.plugin.resources}/META-INF</directory></resource>
</resources>
<sources>
<source>${allopen.src}</source>
<source>${allopen.maven.plugin.src}</source>
</sources>
</configuration>
</execution>
</executions>
@@ -92,11 +69,6 @@
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${allopen.target-src}</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
libraries/tools/kotlin-maven-noarg/pom.xml
+11 -38
View File
@@ -7,10 +7,8 @@
<properties>
<maven.version>3.0.5</maven.version>
<noarg.src>${basedir}/../../../plugins/noarg/noarg-cli/src</noarg.src>
<noarg.resources>${basedir}/../../../plugins/noarg/noarg-cli/resources</noarg.resources>
<noarg.maven.plugin.src>${basedir}/src/main/kotlin</noarg.maven.plugin.src>
<noarg.maven.plugin.resources>${basedir}/src/main/resources</noarg.maven.plugin.resources>
<noarg.target-src>${basedir}/target/src/main/kotlin</noarg.target-src>
<noarg.target-resources>${basedir}/target/resource</noarg.target-resources>
</properties>
<parent>
@@ -40,48 +38,28 @@
</dependencies>
<build>
<sourceDirectory>${noarg.target-src}</sourceDirectory>
<resources>
<resource>
<directory>${noarg.target-resources}</directory>
</resource>
<resource><directory>${noarg.resources}</directory></resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<outputDirectory>${noarg.target-src}</outputDirectory>
<resources>
<resource><directory>${noarg.src}</directory></resource>
<resource><directory>${noarg.maven.plugin.src}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${noarg.target-resources}/META-INF</outputDirectory>
<resources>
<resource><directory>${noarg.src}/META-INF</directory></resource>
<resource><directory>${noarg.maven.plugin.resources}/META-INF</directory></resource>
</resources>
<sources>
<source>${noarg.maven.plugin.src}</source>
<source>${noarg.src}</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
@@ -92,11 +70,6 @@
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${noarg.target-src}</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+11 -38
View File
@@ -7,10 +7,8 @@
<properties>
<maven.version>3.0.5</maven.version>
<sam.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/src</sam.src>
<sam.resources>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/resources</sam.resources>
<sam.maven.plugin.src>${basedir}/src/main/kotlin</sam.maven.plugin.src>
<sam.maven.plugin.resources>${basedir}/src/main/resources</sam.maven.plugin.resources>
<sam.target-src>${basedir}/target/src/main/kotlin</sam.target-src>
<sam.target-resources>${basedir}/target/resource</sam.target-resources>
</properties>
<parent>
@@ -40,48 +38,28 @@
</dependencies>
<build>
<sourceDirectory>${sam.target-src}</sourceDirectory>
<resources>
<resource>
<directory>${sam.target-resources}</directory>
</resource>
<resource><directory>${sam.resources}</directory></resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<outputDirectory>${sam.target-src}</outputDirectory>
<resources>
<resource><directory>${sam.src}</directory></resource>
<resource><directory>${sam.maven.plugin.src}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${sam.target-resources}/META-INF</outputDirectory>
<resources>
<resource><directory>${sam.src}/META-INF</directory></resource>
<resource><directory>${sam.maven.plugin.resources}/META-INF</directory></resource>
</resources>
<sources>
<source>${sam.src}</source>
<source>${sam.maven.plugin.src}</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
@@ -92,11 +70,6 @@
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${sam.target-src}</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
libraries/tools/kotlin-maven-serialization/pom.xml
+10 -52
View File
@@ -7,12 +7,8 @@
<properties>
<maven.version>3.0.5</maven.version>
<serialization.src>${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/src/</serialization.src>
<serialization.src.kt>${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler</serialization.src.kt>
<serialization.resources>${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/resources/</serialization.resources>
<serialization.maven.plugin.src>${basedir}/src/main/kotlin</serialization.maven.plugin.src>
<serialization.maven.plugin.resources>${basedir}/src/main/resources</serialization.maven.plugin.resources>
<serialization.target-src>${basedir}/target/src/main/kotlin</serialization.target-src>
<serialization.target-src.kt>${basedir}/target/src/main/kotlin/org/jetbrains/kotlinx/serialization/compiler</serialization.target-src.kt>
<serialization.target-resources>${basedir}/target/resource</serialization.target-resources>
</properties>
<parent>
@@ -43,56 +39,23 @@
</dependencies>
<build>
<sourceDirectory>${serialization.target-src}</sourceDirectory>
<resources>
<resource>
<directory>${serialization.target-resources}</directory>
</resource>
<resource><directory>${serialization.resources}</directory></resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-maven-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<outputDirectory>${serialization.target-src}</outputDirectory>
<resources>
<resource><directory>${serialization.maven.plugin.src}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${serialization.target-src.kt}</outputDirectory>
<resources>
<resource><directory>${serialization.src.kt}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${serialization.target-resources}/META-INF</outputDirectory>
<resources>
<resource><directory>${serialization.src}/META-INF</directory></resource>
<resource><directory>${serialization.maven.plugin.resources}/META-INF</directory></resource>
</resources>
<sources>
<source>${serialization.src}</source>
<source>${serialization.maven.plugin.src}</source>
</sources>
</configuration>
</execution>
</executions>
@@ -107,11 +70,6 @@
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${serialization.target-src}</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>