Add script runtime, refactorings

libraries/build.gradle

@@ -19,6 +19,19 @@ allprojects  {
 subprojects {
     apply plugin: 'kotlin'
 
+    jar {
+        baseName = project.name
+        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'),
+//                    'Kotlin-Version': kotlin.language.version, // TODO: if we need it - find the way to extract it
+                    'Built-By': 'JetBrains'
+        }
+        from("${rootDir}/../dist/kotlinc/build.txt") { into("META-INF/") }
+    }
+
     task sourcesJar(type: Jar, dependsOn:classes) {
         classifier = 'sources'
         from sourceSets.main.allSource

libraries/settings.gradle

@@ -1,16 +1,15 @@
 rootProject.name = 'kotlin-libraries'
 include ':kotlin-runtime'
 include ':kotlin-script-runtime'
+include ':kotlin-test-parent'
+include ':kotlin-test-parent:kotlin-test'
+include ':kotlin-test-parent:kotlin-test-junit'
 include ':kotlin-stdlib-common'
 include ':kotlin-stdlib'
 include ':kotlin-stdlib-jre7'
 include ':kotlin-stdlib-jre8'
-include ':kotlin-stdlib-samples'
-include ':kotlin-reflect'
 include ':kotlin-js-library'
-include ':kotlin-test-parent:kotlin-test'
+include ':kotlin-reflect'
-include ':kotlin-test-parent:kotlin-test-junit'
-include ':kotlin-test-parent'
 
 //include ':kotlin-compiler'
 //include ':kotlin-compiler-embeddable'
@@ -37,6 +36,7 @@ include ':kotlin-test-parent'
 //include ':kotlin-android-extensions'
 //include ':kotlin-maven-plugin-test'
 //include ':kotlin-script-util'
+//include ':kotlin-stdlib-samples'
 //include ':annotation-processor-example'
 //include ':kotlin-java-example'
 //include ':js-example'
@@ -50,16 +50,15 @@ include ':kotlin-test-parent'
 
 project(':kotlin-runtime').projectDir = "$rootDir/tools/runtime" as File
 project(':kotlin-script-runtime').projectDir = "$rootDir/tools/script-runtime" as File
+project(':kotlin-test-parent').projectDir = "$rootDir/kotlin.test" as File
+project(':kotlin-test-parent:kotlin-test').projectDir = "$rootDir/kotlin.test/shared" as File
+project(':kotlin-test-parent:kotlin-test-junit').projectDir = "$rootDir/kotlin.test/junit" as File
 project(':kotlin-stdlib-common').projectDir = "$rootDir/stdlib/common" as File
 project(':kotlin-stdlib').projectDir = "$rootDir/stdlib" as File
 project(':kotlin-stdlib-jre7').projectDir = "$rootDir/stdlib/jre7" as File
 project(':kotlin-stdlib-jre8').projectDir = "$rootDir/stdlib/jre8" as File
-project(':kotlin-stdlib-samples').projectDir = "$rootDir/stdlib/samples" as File
-project(':kotlin-reflect').projectDir = "$rootDir/tools/kotlin-reflect" as File
 project(':kotlin-js-library').projectDir = "$rootDir/tools/kotlin-js-library" as File
-project(':kotlin-test-parent:kotlin-test').projectDir = "$rootDir/kotlin.test/shared" as File
+project(':kotlin-reflect').projectDir = "$rootDir/tools/kotlin-reflect" as File
-project(':kotlin-test-parent:kotlin-test-junit').projectDir = "$rootDir/kotlin.test/junit" as File
-project(':kotlin-test-parent').projectDir = "$rootDir/kotlin.test" as File
 
 //project(':kotlin-compiler').projectDir = "$rootDir/tools/kotlin-compiler" as File
 //project(':kotlin-compiler-embeddable').projectDir = "$rootDir/tools/kotlin-compiler-embeddable" as File
@@ -86,6 +85,7 @@ project(':kotlin-test-parent').projectDir = "$rootDir/kotlin.test" as File
 //project(':kotlin-android-extensions').projectDir = "$rootDir/tools/kotlin-android-extensions" as File
 //project(':kotlin-maven-plugin-test').projectDir = "$rootDir/tools/kotlin-maven-plugin-test" as File
 //project(':kotlin-script-util').projectDir = "$rootDir/tools/kotlin-script-util" as File
+//project(':kotlin-stdlib-samples').projectDir = "$rootDir/stdlib/samples" as File
 //project(':annotation-processor-example').projectDir = "$rootDir/examples/annotation-processor-example" as File
 //project(':kotlin-java-example').projectDir = "$rootDir/examples/kotlin-java-example" as File
 //project(':js-example').projectDir = "$rootDir/examples/js-example" as File

libraries/tools/runtime/build.gradle

@@ -1,4 +1,6 @@
 
+description 'Kotlin Runtime'
+
 dependencies {
     compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
 }
@@ -8,26 +10,22 @@ sourceSets {
         java {
             srcDir "${rootDir}/../core/builtins/src"
             srcDir "${rootDir}/../core/runtime.jvm/src"
-            exclude "org/jetbrains/annotations/**"
+            exclude 'org/jetbrains/annotations/**'
         }
         kotlin {
             srcDir "${rootDir}/../core/builtins/src"
             srcDir "${rootDir}/../core/runtime.jvm/src"
-            exclude "org/jetbrains/annotations/**"
+            exclude 'org/jetbrains/annotations/**'
         }
     }
 }
 
 jar {
-    baseName = project.name
-    from("${rootDir}/../dist/builtins")
-
     manifest {
-        attributes 'Implementation-Title': 'Kotlin Runtime',
+        attributes 'Kotlin-Runtime-Component': 'Core',
-                   'Implementation-Version': version,
+                'Implementation-Title': "${project.description ?: project.name}"
-                   'Kotlin-Runtime-Component': 'Core'
-
     }
+    from("${rootDir}/../dist/builtins")
 }
 
 artifacts {
@@ -38,5 +36,3 @@ artifacts {
 compileKotlin {
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", "${project.name}".toString()]
 }
-
-

libraries/tools/script-runtime/build.gradle

@@ -0,0 +1,30 @@
+
+description 'Kotlin Script Runtime'
+
+dependencies {
+    compile project(':kotlin-runtime')
+}
+
+sourceSets {
+    main {
+        kotlin {
+            srcDir "${rootDir}/../core/script.runtime/src"
+        }
+    }
+}
+
+jar {
+    manifest {
+        attributes 'Kotlin-Runtime-Component': 'Core',
+            'Implementation-Title': "${project.description ?: project.name}"
+    }
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+compileKotlin {
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", "${project.name}".toString()]
+}