Gradle script tweaks (#154)

erikc5000 · Nov 24, 2020 · 5e3afde · 5e3afde
1 parent f2caac8
commit 5e3afde
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.dokka.gradle.DokkaTask
 
 buildscript {
@@ -14,26 +11,6 @@ buildscript {
 }
 
 subprojects {
-    tasks.withType<JavaCompile>().configureEach {
-        sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-        targetCompatibility = JavaVersion.VERSION_1_8.toString()
-    }
-
-    tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
-            jvmTarget = "1.8"
-        }
-    }
-
-    tasks.withType(AbstractTestTask::class).configureEach {
-        testLogging {
-            events = setOf(TestLogEvent.FAILED)
-            exceptionFormat = TestExceptionFormat.FULL
-            showStackTraces = true
-        }
-    }
-
     tasks.withType<DokkaTask>().configureEach {
         dokkaSourceSets {
             configureEach {

diff --git a/buildSrc/src/main/kotlin/published-library.gradle.kts b/buildSrc/src/main/kotlin/published-library.gradle.kts
@@ -1,4 +1,7 @@
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     id("org.jetbrains.dokka")
@@ -101,3 +104,23 @@ publishing {
         }
     }
 }
+
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
+        jvmTarget = "1.8"
+    }
+}
+
+tasks.withType(AbstractTestTask::class).configureEach {
+    testLogging {
+        events = setOf(TestLogEvent.FAILED)
+        exceptionFormat = TestExceptionFormat.FULL
+        showStackTraces = true
+    }
+}
diff --git a/tools/code-generator/build.gradle.kts b/tools/code-generator/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
 }
 
 application {
-    mainClassName = "io.islandtime.codegen.MainKt"
+    mainClass.set("io.islandtime.codegen.MainKt")
 }
 
 tasks.withType<KotlinCompile>().configureEach {