Refactor build to make manifest specification less error-prone.

Use legacy implementation title in manifest of JS stdlib for now.

Change the way common jvm project configurations is applied.
Add missing artifacts to common libraries.

libraries/build.gradle

@@ -68,34 +68,9 @@ subprojects {
     }
 }
 
-// plain kotlin jvm projects
+static def configureJvmProject(Project project) {
-configure(subprojects.findAll {it.name in [
-        'kotlin-runtime', 'kotlin-script-runtime',
-        'kotlin-stdlib', 'kotlin-stdlib-jre7', 'kotlin-stdlib-jre8',
-        'kotlin-test-junit',
-        'kotlin-reflect']}) {
-
-    apply plugin: 'kotlin'
-
-    commonJvmProjectConfiguration(project)
-
-}
-
-static def commonJvmProjectConfiguration(Project project) {
     project.configure(project) {
-        jar {
+        task sourcesJar(type: Jar, dependsOn: classes) {
-            manifest {
-                attributes 'Implementation-Vendor': 'JetBrains',
-                        'Implementation-Title': "${project.description ?: project.name}", // TODO: project.description is resolved after evaluating this, therefore this attribute is repeated in the projects; seek for a solution
-                        'Implementation-Version': version,
-                        'Build-Jdk': System.getProperty('java.version'),
-                        'Built-By': 'JetBrains'
-            }
-            from("${rootDir}/../dist/kotlinc/build.txt") { into("META-INF/") }
-        }
-
-
-        task sourcesJar(type: Jar, dependsOn:classes) {
             classifier = 'sources'
             from sourceSets.main.kotlin
         }
@@ -117,12 +92,19 @@ static def commonJvmProjectConfiguration(Project project) {
     }
 }
 
-static def manifestAttributes(Manifest manifest, Project project, String component) {
+static def manifestAttributes(Manifest manifest, Project project, String component = null) {
     project.configure(manifest) {
         attributes \
+                'Implementation-Vendor': 'JetBrains',
+                'Implementation-Title': project.archivesBaseName,
+                'Implementation-Version': project.version,
+                'Build-Jdk': System.getProperty('java.version')
+
+        if (component != null) {
+            attributes \
                 'Kotlin-Runtime-Component': component,
-                'Kotlin-Version': "${project.kotlin_language_version}",
+                'Kotlin-Version': project.kotlin_language_version
-                'Implementation-Title': "${project.description ?: project.name}"
+        }
     }
 }
 

libraries/kotlin.test/common/build.gradle

@@ -6,25 +6,16 @@ dependencies {
     compile project(':kotlin-stdlib-common')
 }
 
-
-
-// common block
-
-
 jar {
-    baseName = project.name
+    manifestAttributes(manifest, project, 'Test')
-    manifest {
-        attributes 'Implementation-Vendor': 'JetBrains',
-                'Implementation-Title': "${project.description ?: project.name}", // TODO: project.description is resolved after evaluating this, therefore this attribute is repeated in the projects; seek for a solution
-                'Implementation-Version': version,
-                'Build-Jdk': System.getProperty('java.version'),
-                'Built-By': 'JetBrains'
-    }
-    from("${rootDir}/../dist/kotlinc/build.txt") { into("META-INF/") }
 }
 
-task sourcesJar(type: Jar, dependsOn:classes) {
+task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = 'sources'
     from sourceSets.main.kotlin
-
 }
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}

libraries/kotlin.test/js/build.gradle

@@ -27,12 +27,7 @@ compileTestKotlin2Js {
 archivesBaseName = 'kotlin-test-js'
 
 jar {
-    manifest {
+    manifestAttributes(manifest, project, 'Test')
-        attributes 'addDefaultImplementationEntries': true,
-                'Implementation-Title': "${project.description ?: project.name}"
-    }
-    dependsOn classes
-    from sourceSets.main.output
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

libraries/kotlin.test/junit/build.gradle

@@ -1,27 +1,28 @@
-
 description = 'Kotlin Test JUnit'
 
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
+
 dependencies {
-  compile project(':kotlin-test:kotlin-test-jvm')
+    compile project(':kotlin-test:kotlin-test-jvm')
-  compile('junit:junit:4.12')
+    compile('junit:junit:4.12')
 }
 
 
 jar {
-  manifest {
+    manifestAttributes(manifest, project, 'Test')
-    attributes 'Implementation-Title': "${project.description ?: project.name}"
-  }
 }
 
 artifacts {
-  archives sourcesJar
+    archives sourcesJar
-  archives javadocJar
+    archives javadocJar
 }
 
 compileKotlin {
-  kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
 }
 
 compileTestKotlin {
-  kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
 }

libraries/kotlin.test/jvm/build.gradle

@@ -3,23 +3,19 @@ description = 'Kotlin Test'
 
 apply plugin: 'kotlin-platform-jvm'
 
+configureJvmProject(project)
+
 dependencies {
     implement project(':kotlin-test:kotlin-test-common')
     compile project(':kotlin-stdlib')
     testCompile('junit:junit:4.12')
 }
 
-commonJvmProjectConfiguration(project)
 
 archivesBaseName = 'kotlin-test'
 
 jar {
-    manifest {
+    manifestAttributes(manifest, project, 'Test')
-        attributes 'addDefaultImplementationEntries': true,
-                'Implementation-Title': "${project.description ?: project.name}"
-    }
-    dependsOn classes
-    from sourceSets.main.output
 }
 
 artifacts {

libraries/stdlib/build.gradle

@@ -1,5 +1,9 @@
 description = 'Kotlin Standard Library'
 
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
+
 sourceSets {
     builtins {
         java {
@@ -39,7 +43,7 @@ task originalStdlibJar(type: Jar) {
 }
 
 jar {
-    manifestAttributes(manifest, project, 'Core')
+    manifestAttributes(manifest, project, 'Main')
     from("${rootDir}/../dist/builtins")
     from sourceSets.builtins.output
 }

libraries/stdlib/common/build.gradle

@@ -29,20 +29,16 @@ compileKotlinCommon {
 */
 
 jar {
-    baseName = project.name
+    manifestAttributes(manifest, project, 'Main')
-    manifest {
-        attributes 'Implementation-Vendor': 'JetBrains',
-                'Implementation-Title': "${project.description ?: project.name}", // TODO: project.description is resolved after evaluating this, therefore this attribute is repeated in the projects; seek for a solution
-                'Implementation-Version': version,
-                'Build-Jdk': System.getProperty('java.version'),
-                'Built-By': 'JetBrains'
-    }
-    from("${rootDir}/../dist/kotlinc/build.txt") { into("META-INF/") }
 }
 
 
-task sourcesJar(type: Jar, dependsOn:classes) {
+task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = 'sources'
     from sourceSets.main.kotlin
-
 }
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}

libraries/stdlib/jre7/build.gradle

@@ -1,5 +1,8 @@
 description = 'Kotlin Standard Library JRE 7 extension'
 
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
 
 dependencies {
     compile project(':kotlin-stdlib')
@@ -23,7 +26,7 @@ sourceSets {
 }
 
 jar {
-    manifestAttributes(manifest, project, 'Core')
+    manifestAttributes(manifest, project, 'Main')
 }
 
 artifacts {

libraries/stdlib/jre8/build.gradle

@@ -1,5 +1,9 @@
 description = 'Kotlin Standard Library JRE 8 extension'
 
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
+
 dependencies {
     compile project(':kotlin-stdlib')
     compile project(':kotlin-stdlib-jre7')
@@ -24,7 +28,7 @@ sourceSets {
 }
 
 jar {
-    manifestAttributes(manifest, project, 'Core')
+    manifestAttributes(manifest, project, 'Main')
 }
 
 artifacts {

libraries/stdlib/js/build.gradle

@@ -188,6 +188,15 @@ jar {
 
 task mergedJar(type: Jar, dependsOn: classes) {
     classifier = null
+    manifestAttributes(manifest, project, 'Main')
+
+    // TODO: Use standard implementation title after js stdlib detector becomes more flexible
+    Properties properties = new Properties()
+    new File("${rootDir}/../resources/kotlinManifest.properties").withInputStream {
+        properties.load(it)
+    }
+    manifest.attributes 'Implementation-Title' : properties."manifest.impl.title.kotlin.javascript.stdlib"
+
     includeEmptyDirs false
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
     from jsOutputFile

libraries/tools/kotlin-reflect/build.gradle

@@ -13,6 +13,10 @@ buildscript {
 }
 
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
+
 
 def core = "${rootDir}/../core"
 def annotationsSrc = "${buildDir}/annotations"
@@ -79,6 +83,9 @@ kotlin.experimental.coroutines "enable"
 task reflectShadowJar(type: ShadowJar) {
     classifier = 'shadow'
     version = null
+    manifestAttributes(manifest, project, 'Main')
+    manifest.attributes 'Class-Path': 'kotlin-runtime.jar' // TODO replace soon with 'kotlin-stdlib.jar'
+
     from (sourceSets.main.output)
     from ("${core}/descriptor.loader.java/src") {
         include 'META-INF/services/**'

libraries/tools/runtime/build.gradle

@@ -1,5 +1,8 @@
+description 'Kotlin Runtime (deprecated, use koltin-stdlib artifact instead)'
 
-description 'Kotlin Runtime'
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
 
 dependencies {
     compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
@@ -20,7 +23,7 @@ sourceSets {
 }
 
 jar {
-    manifestAttributes(manifest, project, 'Core')
+    manifestAttributes(manifest, project, 'Main')
     from("${rootDir}/../dist/builtins")
 }
 

libraries/tools/script-runtime/build.gradle

@@ -1,6 +1,9 @@
-
 description 'Kotlin Script Runtime'
 
+apply plugin: 'kotlin'
+
+configureJvmProject(project)
+
 dependencies {
     compileOnly project(':kotlin-stdlib')
 }
@@ -14,7 +17,7 @@ sourceSets {
 }
 
 jar {
-    manifestAttributes(manifest, project, 'Core')
+    manifestAttributes(manifest, project, 'Main')
 }
 
 artifacts {