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

Support inline true/false options

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-03-20 15:32:20 +04:00
parent 0b1470b5e5
commit ca4609dd2a
34 changed files with 357 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+6 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.doc.KDocConfig
import java.util.concurrent.Callable
import org.gradle.api.Project
import org.jetbrains.jet.cli.common.arguments.CompilerArgumentsUtil
public open class KotlinCompile(): AbstractCompile() {
@@ -114,7 +115,11 @@ public open class KotlinCompile(): AbstractCompile() {
args.noStdlib = true
args.noJdkAnnotations = true
args.enableInline = kotlinOptions.enableInline
args.inline = kotlinOptions.inline
if (!CompilerArgumentsUtil.checkInlineOption(args.inline)) {
throw GradleException(CompilerArgumentsUtil.getWrongOptionErrorMessage(args.inline))
}
val messageCollector = GradleMessageCollector(logger)
val exitCode = compiler.exec(messageCollector, args)
libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+6
View File
@@ -37,6 +37,12 @@ class BasicKotlinGradleIT : BaseGradleIT() {
}
}
Test fun testInlineDisabled() {
Project("inlineDisabled").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
assertSuccessful()
}
}
Test fun testSimpleKDoc() {
Project("delta").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
assertSuccessful()
libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/build.gradle
-1
View File
@@ -45,7 +45,6 @@ task show << {
compileKotlin {
kotlinOptions.annotations = "externalAnnotations"
kotlinOptions.enableInline = "off";
}
libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/inlineDisabled/build.gradle
+50
View File
@@ -0,0 +1,50 @@
buildscript {
repositories {
mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
}
dependencies {
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
}
}
import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
apply plugin: KotlinPlugin
sourceSets {
main {
kotlin {
srcDir 'src'
}
}
}
repositories {
maven {
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
}
dependencies {
compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8'
testRuntime 'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
}
test {
useTestNG()
}
compileKotlin {
kotlinOptions.annotations = "externalAnnotations"
kotlinOptions.inline = false
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/inlineDisabled/externalAnnotations/com/google/common/base/annotations.xml
+11
View File
@@ -0,0 +1,11 @@
<root>
<item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
<annotation name="org.jetbrains.annotations.NotNull" />
</item>
<item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
<annotation name="org.jetbrains.annotations.NotNull" />
</item>
<item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
<annotation name="org.jetbrains.annotations.NotNull" />
</item>
</root>
libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/inlineDisabled/src/helloWorld.kt
+13
View File
@@ -0,0 +1,13 @@
package demo
import java.util.ArrayList
class KotlinGreetingJoiner() {
val names = ArrayList<String?>()
fun addName(name : String?): Unit{
names.add(name)
}
}
libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/pom.xml
-5
View File
@@ -70,11 +70,6 @@
</goals>
</execution>
</executions>
<configuration>
<inline>
off
</inline>
</configuration>
</plugin>
</plugins>
</build>
libraries/tools/kotlin-maven-plugin/src/it/test-inlineDisabled/pom.xml
+80
View File
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin.it</groupId>
<artifactId>test-inlineDisabled</artifactId>
<version>1.0</version>
<name>Test Hello World project</name>
<description>
Test the kotlin-maven-plugin:compile goal on HelloWorld project.
</description>
<properties>
<kotlin.version>0.1-SNAPSHOT</kotlin.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
</plugin>
</plugins>
</pluginManagement>
<!--suppress MavenModelInspection -->
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<!--suppress MavenModelInspection -->
<!--testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory-->
<plugins>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>process-test-sources</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<inline>false</inline>
</configuration>
</plugin>
</plugins>
</build>
</project>
libraries/tools/kotlin-maven-plugin/src/it/test-inlineDisabled/src/main/kotlin/org/jetbrains/HelloWorld.kt
+9
View File
@@ -0,0 +1,9 @@
package org.jetbrains
fun main(args : Array<String>) {
System.out?.println(getGreeting())
}
fun getGreeting() : String {
return "Hello, World!"
}
libraries/tools/kotlin-maven-plugin/src/it/test-inlineDisabled/src/test/java/org/jetbrains/HelloWorldJavaTest.java
+13
View File
@@ -0,0 +1,13 @@
package org.jetbrains;
import org.junit.Test;
import static junit.framework.Assert.assertEquals;
public class HelloWorldJavaTest {
@Test
public void greeting() {
assertEquals("Hello, World!", org.jetbrains.JetbrainsPackage.getGreeting());
}
}
libraries/tools/kotlin-maven-plugin/src/it/test-inlineDisabled/verify.bsh
+7
View File
@@ -0,0 +1,7 @@
import java.io.*;
File file = new File( basedir, "target/test-inlineDisabled-1.0.jar" );
if (!file.exists() || !file.isFile())
{
throw new FileNotFoundException( "Could not find generated JAR: " + file );
}
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+6 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
import org.jetbrains.jet.lang.types.lang.InlineUtil;
import org.jetbrains.jet.cli.common.arguments.CompilerArgumentsUtil;
import java.io.File;
import java.io.IOException;
@@ -312,8 +312,11 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
arguments.noJdkAnnotations = true;
arguments.annotations = getFullAnnotationsPath(log, annotationPaths);
log.info("Using kotlin annotations from " + arguments.annotations);
arguments.enableInline = inline;
log.info("Method inlining is " + InlineUtil.optionToInlineFlag(arguments.enableInline));
arguments.inline = inline;
if (!CompilerArgumentsUtil.checkInlineOption(arguments.inline)) {
throw new MojoExecutionException(CompilerArgumentsUtil.getWrongOptionErrorMessage(arguments.inline));
}
log.info("Method inlining is " + CompilerArgumentsUtil.optionToInlineFlag(arguments.inline));
}
protected String getFullAnnotationsPath(Log log, List<String> annotations) {