1 files changed, 25 insertions, 10 deletions
diff --git a/atomicfu-gradle-plugin/build.gradle b/atomicfu-gradle-plugin/build.gradle
index 28091b6..5312551 100644
--- a/atomicfu-gradle-plugin/build.gradle
+++ b/atomicfu-gradle-plugin/build.gradle
@@ -14,26 +14,41 @@ if (rootProject.ext.jvm_ir_enabled) {
 // Gradle plugin must be compiled targeting the same Kotlin version as used by Gradle
 kotlin.sourceSets.all {
     languageSettings {
-        apiVersion = "1.3"
-        languageVersion = "1.3"
+        apiVersion = "1.4"
+        languageVersion = "1.4"
     }
 }
 
 dependencies {
-    compile gradleApi()
-    compile project(":atomicfu-transformer")
-    compile 'org.jetbrains.kotlin:kotlin-stdlib'
+    implementation(project(":atomicfu-transformer")) {
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
+    }
 
+    compileOnly gradleApi()
+    compileOnly 'org.jetbrains.kotlin:kotlin-stdlib'
     compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    // atomicfu compiler plugin dependency will be loaded to kotlinCompilerPluginClasspath
+    implementation "org.jetbrains.kotlin:atomicfu:$kotlin_version"
 
-    testCompile gradleTestKit()
-    testCompile 'org.jetbrains.kotlin:kotlin-test'
-    testCompile 'org.jetbrains.kotlin:kotlin-test-junit'
-    testCompile 'junit:junit:4.12'
+    testImplementation gradleTestKit()
+    testImplementation 'org.jetbrains.kotlin:kotlin-test'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
+    testImplementation 'junit:junit:4.12'
 }
 
 configurations {
-    testPluginClasspath
+    testPluginClasspath {
+        attributes {
+            attribute(
+                    Usage.USAGE_ATTRIBUTE,
+                    project.objects.named(Usage.class, Usage.JAVA_RUNTIME)
+            )
+            attribute(
+                    Category.CATEGORY_ATTRIBUTE,
+                    project.objects.named(Category.class, Category.LIBRARY)
+            )
+        }
+    }
 }
 
 dependencies {