Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TS-38628] [Teamscale Maven Plugin] Kotlin Migration #638

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import static org.junit.jupiter.api.Assertions.assertAll;

/**
* Runs several Maven projects' Surefire tests that have the agent attached and one of our JUnit run listeners enabled.
* Runs several Maven projects' Surefire tests that have the agent attached, and one of our JUnit run listeners enabled.
* Checks that this produces a correct coverage report.
*/
public class TiaMavenCucumberSystemTest {
Expand Down
67 changes: 64 additions & 3 deletions teamscale-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

Expand Down Expand Up @@ -59,6 +59,8 @@
This prevents frequent updates of this file in the repository.
-->
<teamscale.agent.version>34.0.0</teamscale.agent.version>
<kotlin.version>2.1.0</kotlin.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
</properties>

<dependencies>
Expand All @@ -68,11 +70,23 @@
<version>5.11.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.teamscale</groupId>
<artifactId>teamscale-jacoco-agent</artifactId>
<version>${teamscale.agent.version}</version>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Expand All @@ -91,6 +105,7 @@
<version>3.9.9</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
Expand All @@ -107,7 +122,6 @@
<version>${teamscale.agent.version}</version>
<scope>runtime</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -124,11 +138,58 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<sourceDirs>
<source>src/main/kotlin</source>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<sourceDirs>
<source>src/test/kotlin</source>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.15.1</version>
<version>3.6.4</version>
<configuration>
<extractors>
<extractor>kotlin</extractor>
</extractors>
</configuration>
<dependencies>
<dependency>
<groupId>com.github.gantsign.maven.plugin-tools</groupId>
<artifactId>kotlin-maven-plugin-tools</artifactId>
<version>1.1.0</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
<execution>
<id>generate-helpmojo</id>
<goals>
Expand Down
Empty file.

This file was deleted.

This file was deleted.

Loading
Loading