From d6261521ff1ed0bc5112da8cf144a74ce5efefe8 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 15 Jun 2016 20:51:48 +0300
Subject: [PATCH] Create new artifacts for standard library extensions for JRE7
 and JRE8. Set default JDK for kotlin compiler plugin. Set default JRE path
 for maven surefire plugin. Run tests for extension modules on the
 corresponding JRE. #KT-8254

---
 libraries/pom.xml             |   4 ++
 libraries/stdlib/jre7/pom.xml | 101 ++++++++++++++++++++++++++++++++++
 libraries/stdlib/jre8/pom.xml | 101 ++++++++++++++++++++++++++++++++++
 libraries/stdlib/pom.xml      |   9 ++-
 4 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 libraries/stdlib/jre7/pom.xml
 create mode 100644 libraries/stdlib/jre8/pom.xml

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 3370f8b5ff7..a734c3d6c32 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -50,6 +50,7 @@
 
         <kotlin-dist>${project-root}/dist</kotlin-dist>
         <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
+        <kotlin.compiler.jdkHome>${env.JDK_16}</kotlin.compiler.jdkHome>
 
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
@@ -79,6 +80,8 @@
 
         <module>tools/runtime</module>
         <module>stdlib</module>
+        <module>stdlib/jre7</module>
+        <module>stdlib/jre8</module>
         <module>tools/kotlin-reflect</module>
         <module>tools/kotlin-osgi-bundle</module>
 
@@ -161,6 +164,7 @@
                 <version>${surefire-version}</version>
                 <configuration>
                     <forkMode>once</forkMode>
+                    <jvm>${env.JDK_16}/bin/java</jvm>
                     <useSystemClassLoader>false</useSystemClassLoader>
                     <useManifestOnlyJar>false</useManifestOnlyJar>
                     <failIfNoTests>false</failIfNoTests>
diff --git a/libraries/stdlib/jre7/pom.xml b/libraries/stdlib/jre7/pom.xml
new file mode 100644
index 00000000000..5d844692192
--- /dev/null
+++ b/libraries/stdlib/jre7/pom.xml
@@ -0,0 +1,101 @@
+<?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>1.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-stdlib-jre7</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                 <configuration>
+                     <jdkHome>${env.JDK_17}</jdkHome>
+                     <args>
+                         <arg>-Xallow-kotlin-package</arg>
+                     </args>
+                 </configuration>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <args combine.children="append">
+                                <arg>-Xmultifile-parts-inherit</arg>
+                                <arg>-Xdump-declarations-to</arg>
+                                <arg>${basedir}/target/stdlib-jre7-declarations.json</arg>
+                            </args>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${basedir}/test</sourceDir>
+                                <sourceDir>${basedir}/../test</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>once</forkMode>
+                    <jvm>${env.JDK_17}/bin/java</jvm>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>binary-compatibility-test</id>
+                        <goals> <goal>test</goal> </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <testSourceDirectory>${basedir}/../test</testSourceDirectory>
+                            <testClassesDirectory>${basedir}/../target/test-classes</testClassesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/libraries/stdlib/jre8/pom.xml b/libraries/stdlib/jre8/pom.xml
new file mode 100644
index 00000000000..2dda86eae00
--- /dev/null
+++ b/libraries/stdlib/jre8/pom.xml
@@ -0,0 +1,101 @@
+<?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>1.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-stdlib-jre8</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jre7</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                 <configuration>
+                     <jdkHome>${env.JDK_18}</jdkHome>
+                     <args>
+                         <arg>-Xallow-kotlin-package</arg>
+                     </args>
+                 </configuration>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <args combine.children="append">
+                                <arg>-Xmultifile-parts-inherit</arg>
+                                <arg>-Xdump-declarations-to</arg>
+                                <arg>${basedir}/target/stdlib-jre8-declarations.json</arg>
+                            </args>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${basedir}/test</sourceDir>
+                                <sourceDir>${basedir}/../jdk7/test</sourceDir>
+                                <sourceDir>${basedir}/../test</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>once</forkMode>
+                    <jvm>${env.JDK_18}/bin/java</jvm>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>binary-compatibility-test</id>
+                        <goals> <goal>test</goal> </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <testSourceDirectory>${basedir}/../test</testSourceDirectory>
+                            <testClassesDirectory>${basedir}/../target/test-classes</testClassesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index 7bcd433dfef..f94dbdbe19c 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -32,7 +32,7 @@
         <testSourceDirectory>test</testSourceDirectory>
 
         <plugins>
-             <plugin>
+            <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${project.version}</version>
@@ -68,6 +68,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>once</forkMode>
+                    <jvm>${env.JDK_16}/bin/java</jvm>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>