Modernize Gradle files (#363)

erikc5000 · Nov 1, 2023 · f6cf63d · f6cf63d
1 parent d734e6d
commit f6cf63d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ tasks.register<DokkaMultiModuleTask>("dokkaMkdocsMultiModule") {
     // This is deprecated, but doesn't seem to have a replacement yet
     @Suppress("DEPRECATION")
     addSubprojectChildTasks("dokkaMkdocsPartial")
-    outputDirectory.set(file("$rootDir/docs/api"))
+    outputDirectory = file("$rootDir/docs/api")
 }
 
 tasks.register("codegen") {

diff --git a/buildSrc/src/main/kotlin/published-library.gradle.kts b/buildSrc/src/main/kotlin/published-library.gradle.kts
@@ -19,7 +19,7 @@ tasks.register<DokkaTaskPartial>("dokkaMkdocsPartial") {
 val javadocJar by tasks.registering(Jar::class) {
     val dokkaHtml = tasks.named<DokkaTask>("dokkaHtml")
     dependsOn(dokkaHtml)
-    archiveClassifier.set("javadoc")
+    archiveClassifier = "javadoc"
     from(dokkaHtml.get().outputDirectory)
 }
 
@@ -73,26 +73,26 @@ publishing {
         }
 
         pom {
-            name.set(pomName)
-            description.set(pomDescription)
-            url.set(pomUrl)
+            name = pomName
+            description = pomDescription
+            url = pomUrl
             licenses {
                 license {
-                    name.set(pomLicenseName)
-                    url.set(pomLicenseUrl)
-                    distribution.set(pomLicenseDist)
+                    name = pomLicenseName
+                    url = pomLicenseUrl
+                    distribution = pomLicenseDist
                 }
             }
             developers {
                 developer {
-                    id.set(pomDeveloperId)
-                    name.set(pomDeveloperName)
+                    id = pomDeveloperId
+                    name = pomDeveloperName
 
                 }
             }
             scm {
-                connection.set(pomScmConnection)
-                url.set(pomScmUrl)
+                connection = pomScmConnection
+                url = pomScmUrl
             }
         }
     }
@@ -106,8 +106,8 @@ tasks.withType<AbstractDokkaLeafTask>().configureEach {
     dokkaSourceSets {
         configureEach {
             includes.from(project.file("MODULE.md"))
-            skipEmptyPackages.set(true)
-            skipDeprecated.set(true)
+            skipEmptyPackages = true
+            skipDeprecated = true
         }
     }
 }
diff --git a/extensions/parcelize/build.gradle.kts b/extensions/parcelize/build.gradle.kts
@@ -10,11 +10,6 @@ android {
         isCoreLibraryDesugaringEnabled = true
     }
 
-    sourceSets {
-        getByName("main").java.srcDirs("src/main/kotlin")
-        getByName("androidTest").java.srcDirs("src/androidTest/kotlin")
-    }
-
     defaultConfig {
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/tools/code-generator/build.gradle.kts b/tools/code-generator/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.kotlinJvm)
@@ -10,17 +11,17 @@ dependencies {
 }
 
 application {
-    mainClass.set("io.islandtime.codegen.MainKt")
+    mainClass = "io.islandtime.codegen.MainKt"
 }
 
 tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
+tasks.withType<KotlinJvmCompile>().configureEach {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+        optIn.add("kotlin.RequiresOptIn")
     }
 }