Tune build options for kotlin-test, kotlin-runtime, kotlin-stdlib, kotlin-stdlib-jre7/8

libraries/stdlib/jre8/build.gradle

@@ -1,61 +1,53 @@
-
-description = 'Kotlin stdlib JRE 8'
+description = 'Kotlin Standard Library JRE 8 extension'
 
 dependencies {
-  compile project(':kotlin-stdlib')
-  compile project(':kotlin-stdlib-jre7')
-  testCompile project(':kotlin-test-parent:kotlin-test-junit')
-  testCompile project(':kotlin-stdlib-jre7')
+    compile project(':kotlin-stdlib')
+    compile project(':kotlin-stdlib-jre7')
+    testCompile project(':kotlin-test-parent:kotlin-test-junit')
 }
 
 sourceSets {
-  main {
-    kotlin {
-      srcDir 'src'
+    main {
+        kotlin {
+            srcDir 'src'
+        }
     }
-  }
-  test {
-    kotlin {
-      srcDir 'test'
-      srcDir '../test'
-      srcDir '../jre7/test'
+    test {
+        kotlin {
+            srcDir 'test'
+            srcDir '../test'
+            srcDir '../jre7/test'
+        }
     }
-  }
 }
 
 jar {
-  manifest {
-    attributes 'Kotlin-Runtime-Component': 'Core',
+    manifest {
+        attributes \
+            'Kotlin-Runtime-Component': 'Core',
+            'Kotlin-Version': "$kotlin_language_version",
             'Implementation-Title': "${project.description ?: project.name}"
-  }
+    }
 }
 
 artifacts {
-  archives sourcesJar
-  archives javadocJar
-}
-
-compileJava {
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
-}
-
-compileTestJava {
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+    archives sourcesJar
+    archives javadocJar
 }
 
 compileKotlin {
-  kotlinOptions.jdkHome = System.getenv('JDK_18')
-  kotlinOptions.jvmTarget = 1.8
-  kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package",
-                                    "-Xmultifile-parts-inherit",
-                                    "-Xdump-declarations-to", "${buildDir}/stdlib-declarations.json".toString(),
-                                    "-module-name", "${project.name}".toString()]
+    kotlinOptions.jdkHome = JDK_18
+    kotlinOptions.jvmTarget = 1.8
+    kotlinOptions.freeCompilerArgs = [
+            "-Xallow-kotlin-package",
+            "-Xmultifile-parts-inherit",
+            "-Xdump-declarations-to", "${buildDir}/stdlib-jre8-declarations.json",
+            "-module-name", project.name
+    ]
 }
 
 compileTestKotlin {
-  kotlinOptions.jdkHome = System.getenv('JDK_18')
-  kotlinOptions.jvmTarget = 1.8
-  kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.jdkHome = JDK_18
+    kotlinOptions.jvmTarget = 1.8
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
 }