Fix maven and android tests after modularizing and rebasing

This commit is contained in:
Ilya Chernikov
2017-09-02 14:17:17 +03:00
parent 3a55ed31a6
commit 3aabeca191
10 changed files with 43 additions and 2 deletions
@@ -39,6 +39,14 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
</configuration>
</plugin>
</plugins>
</build>
@@ -40,6 +40,21 @@
<artifactId>kotlin-compiler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-script-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
+1 -1
View File
@@ -47,7 +47,7 @@ dependencies {
shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
compile project(':kotlin-stdlib')
compile project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
compileOnly project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
}
task copyAnnotations(type: Sync) {