move kotlin-jvm plugin into conventions, specify target compatibility

mfwgenerics · Jan 11, 2023 · 2ab492d · 2ab492d
1 parent 6cbda28
commit 2ab492d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -7,5 +7,6 @@ repositories {
 }
 
 dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
     implementation("com.palantir.gradle.gitversion:gradle-git-version:0.15.0")
 }
diff --git a/build-logic/src/main/kotlin/conventions.gradle.kts b/build-logic/src/main/kotlin/conventions.gradle.kts
@@ -1,4 +1,12 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+repositories {
+    mavenCentral()
+}
+
 plugins {
+    kotlin("jvm")
+
     id("com.palantir.git-version")
 }
 
@@ -8,4 +16,14 @@ group = "io.koalaql"
 version = gitVersion()
 
 check("$version".isNotBlank() && version != "unspecified")
-    { "invalid version $version" }
+    { "invalid version $version" }
+
+java {
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
diff --git a/markout/build.gradle.kts b/markout/build.gradle.kts
@@ -4,8 +4,6 @@ repositories {
 
 plugins {
     id("publish")
-
-    kotlin("jvm") version "1.8.0"
 }
 
 dependencies {

diff --git a/readme/build.gradle.kts b/readme/build.gradle.kts
@@ -3,8 +3,6 @@ repositories {
 }
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-
     id("io.koalaql.kapshot-plugin") version "0.1.0"
 
     application