Build: Fix variant resolution ambiguity

libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

@@ -11,7 +11,12 @@ pill {
     variant = PillExtension.Variant.FULL
 }
 
-val compilerClasspath by configurations.creating
+val compilerClasspath by configurations.creating {
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+    }
+}
 
 dependencies {
     testCompile(kotlinStdlib())

libraries/kotlin.test/js/it/build.gradle

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
+
 plugins {
     id "com.github.node-gradle.node" version "2.2.0"
 }
@@ -8,9 +11,10 @@ apply plugin: 'kotlin-platform-js'
 
 configurations {
     nodeModules {
-        extendsFrom testCompile
+        extendsFrom compile
         attributes {
-            attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
+            attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, KotlinUsages.KOTLIN_RUNTIME))
+            attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
         }
     }
 }

libraries/scripting/jsr223-test/build.gradle.kts

@@ -5,7 +5,12 @@ plugins {
 
 jvmTarget = "1.6"
 
-val embeddableTestRuntime by configurations.creating
+val embeddableTestRuntime by configurations.creating {
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+    }
+}
 
 dependencies {
     testCompile(commonDep("junit"))

libraries/tools/kotlin-main-kts/build.gradle.kts

@@ -13,14 +13,11 @@ val jarBaseName = property("archivesBaseName") as String
 
 val proguardLibraryJars by configurations.creating {
     attributes {
-        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
-    }
-}
-val relocatedJarContents by configurations.creating  {
-    attributes {
-        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_API))
     }
 }
+
+val relocatedJarContents by configurations.creating
         
 val embedded by configurations