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

Introduce kotlin-reflect Maven artifact

Browse Source
This commit is contained in:
Alexander Udalov
2015-02-17 16:26:28 +03:00
parent 4f649f5a33
commit eced3003ad
5 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kotlin.iml
+1
View File
@@ -40,6 +40,7 @@
<excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/target" />
<excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/local-repo" />
<excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/target" />
<excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-reflect/target" />
<excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/target" />
<excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/target" />
</content>
compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
+4 -3
View File
@@ -37,7 +37,7 @@ public class JetCodeConformanceTest extends TestCase {
private static final List<File> EXCLUDED_FILES_AND_DIRS = Arrays.asList(
new File("android.tests.dependencies"),
new File("core/reflection.jvm/src/kotlin/reflect/jvm/internal/pcollections"),
new File("libraries/tools/runtime/target/copied-sources"),
new File("libraries/tools/kotlin-reflect/target/copied-sources"),
new File("dependencies"),
new File("js/js.translator/qunit/qunit.js"),
new File("libraries/tools/kotlin-js-tests/src/test/web/qunit.js"),
@@ -47,7 +47,8 @@ public class JetCodeConformanceTest extends TestCase {
new File("ideaSDK"),
new File("libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp"),
new File("compiler/testData/psi/kdoc"),
new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java"));
new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java")
);
public static final Pattern AUTHOR_JAVADOC_PATTERN = Pattern.compile("/\\*.+@author.+\\*/", Pattern.DOTALL);
public void testParserCode() throws Exception {
@@ -73,7 +74,7 @@ public class JetCodeConformanceTest extends TestCase {
});
if (!filesWithAuthorJavadoc.isEmpty()) {
fail(String.format("%d source files contain @author javadoc tag. Please remove them:\n%s",
fail(String.format("%d source files contain @author javadoc tag. Please remove them or exclude in this test:\n%s",
filesWithAuthorJavadoc.size(), StringUtil.join(filesWithAuthorJavadoc, "\n")));
}
}
libraries/pom.xml
+6 -4
View File
@@ -77,7 +77,13 @@
<module>tools/kotlin-compiler</module>
<module>tools/kotlin-jdk-annotations</module>
<module>tools/kotlin-android-sdk-annotations</module>
<module>tools/kotlin-maven-plugin</module>
<module>tools/runtime</module>
<module>stdlib</module>
<module>stdlib/validator</module>
<module>tools/kotlin-reflect</module>
<!--NB! kotlin-js-library should be built before kotlin-gradle-plugin-->
<!--because it is used in tests but cannot be added as test-dependency-->
<!--(kotlin-gradle-plugin module will be recognized as kotlin-js module)-->
@@ -86,16 +92,12 @@
<module>tools/kotlin-gradle-plugin-core</module>
<module>tools/kotlin-gradle-plugin-api</module>
<module>tools/kotlin-android-compiler-plugin</module>
<module>tools/kotlin-maven-plugin</module>
<module>tools/kotlin-maven-plugin-test</module>
<module>tools/kotlin-js-tests</module>
<module>tools/kotlin-js-tests-junit</module>
<module>tools/kdoc</module>
<module>tools/kdoc-maven-plugin</module>
<module>stdlib</module>
<module>stdlib/validator</module>
<module>kunit</module>
<module>kotlin-jdbc</module>
<module>kotlin-swing</module>
libraries/tools/kotlin-reflect/pom.xml
+71
View File
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
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>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>kotlin-reflect</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>target/copied-sources</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>copy-sources</id>
<phase>process-sources</phase>
<configuration>
<target>
<delete dir="${basedir}/target/copied-sources" failonerror="false" />
<copy todir="${basedir}/target/copied-sources">
<fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
libraries/tools/runtime/pom.xml
-1
View File
@@ -35,7 +35,6 @@
<fileset dir="${basedir}/../../../core/builtins/src"/>
<fileset dir="${basedir}/../../../core/runtime.jvm/src"/>
<fileset dir="${basedir}/../../../core/reflection/src"/>
<fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
</copy>
</target>
</configuration>