fix ktlint and configure compatibility (#492)

pinterest · Jun 17, 2019 · 563b136 · 563b136
1 parent af72025
commit 563b136
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,4 +57,18 @@ allprojects {
   repositories {
     gradlePluginPortal()
   }
+
+  tasks.withType(JavaCompile) {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
+  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    kotlinOptions {
+      jvmTarget = '1.8'
+    }
+  }
 }
diff --git a/ktlint-ruleset-template/build.gradle b/ktlint-ruleset-template/build.gradle
@@ -6,13 +6,6 @@ plugins {
 
 group = 'com.github.username'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-repositories {
-  jcenter()
-}
-
 task sourcesJar(type: Jar, dependsOn: classes) {
   classifier = 'sources'
   from sourceSets.main.allSource

diff --git a/ktlint/build.gradle b/ktlint/build.gradle
@@ -34,12 +34,3 @@ dependencies {
   testImplementation deps.assertj
   testImplementation deps.jimfs
 }
-
-compileKotlin {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
-
-  kotlinOptions {
-    jvmTarget = '1.8'
-  }
-}