chrisbanes · chrisbanes · May 7, 2024 · May 6, 2024 · May 6, 2024
diff --git a/api/tmdb/build.gradle.kts b/api/tmdb/build.gradle.kts
@@ -24,7 +24,7 @@ buildConfig {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         implementation(projects.core.logging.api)
@@ -38,14 +38,14 @@ kotlin {
       }
     }
 
-    val jvmMain by getting {
+    jvmMain {
       dependencies {
         api(libs.okhttp.okhttp)
         implementation(libs.ktor.client.okhttp)
       }
     }
 
-    val iosMain by getting {
+    iosMain {
       dependencies {
         implementation(libs.ktor.client.darwin)
       }

diff --git a/api/trakt/build.gradle.kts b/api/trakt/build.gradle.kts
@@ -34,7 +34,7 @@ buildConfig {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         implementation(projects.core.logging.api)
@@ -51,14 +51,14 @@ kotlin {
       }
     }
 
-    val jvmMain by getting {
+    jvmMain {
       dependencies {
         api(libs.okhttp.okhttp)
         implementation(libs.ktor.client.okhttp)
       }
     }
 
-    val iosMain by getting {
+    iosMain {
       dependencies {
         implementation(libs.ktor.client.darwin)
       }

diff --git a/common/imageloading/build.gradle.kts b/common/imageloading/build.gradle.kts
@@ -2,16 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-
 plugins {
   id("app.tivi.android.library")
   id("app.tivi.kotlin.multiplatform")
 }
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         implementation(projects.core.logging.api)
@@ -32,14 +30,6 @@ kotlin {
   }
 }
 
-tasks.withType<KotlinCompilationTask<*>>().configureEach {
-  compilerOptions {
-    // Have to disable this due to 'duplicate library name'
-    // https://youtrack.jetbrains.com/issue/KT-51110
-    allWarningsAsErrors = false
-  }
-}
-
 android {
   namespace = "app.tivi.common.imageloading"
 }
diff --git a/common/ui/circuit-overlay/build.gradle.kts b/common/ui/circuit-overlay/build.gradle.kts
@@ -14,7 +14,7 @@ android {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.common.ui.compose)
         implementation(projects.common.ui.screens)

diff --git a/common/ui/compose/build.gradle.kts b/common/ui/compose/build.gradle.kts
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-
 plugins {
   id("app.tivi.android.library")
   id("app.tivi.kotlin.multiplatform")
@@ -12,7 +10,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.data.models)
         api(projects.core.preferences)
@@ -43,14 +41,14 @@ kotlin {
     }
 
     val jvmCommon by creating {
-      dependsOn(commonMain)
+      dependsOn(commonMain.get())
     }
 
-    val jvmMain by getting {
+    jvmMain {
       dependsOn(jvmCommon)
     }
 
-    val androidMain by getting {
+    androidMain {
       dependsOn(jvmCommon)
 
       dependencies {
@@ -60,14 +58,6 @@ kotlin {
   }
 }
 
-tasks.withType<KotlinCompilationTask<*>>().configureEach {
-  compilerOptions {
-    // Have to disable this due to 'duplicate library name'
-    // https://youtrack.jetbrains.com/issue/KT-51110
-    allWarningsAsErrors = false
-  }
-}
-
 android {
   namespace = "app.tivi.common.compose"
 

diff --git a/common/ui/resources/fonts/build.gradle.kts b/common/ui/resources/fonts/build.gradle.kts
@@ -10,13 +10,13 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(compose.ui)
       }
     }
 
-    val iosMain by getting {
+    iosMain {
       dependencies {
         @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
         implementation(compose.components.resources)

diff --git a/common/ui/resources/strings/build.gradle.kts b/common/ui/resources/strings/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.data.models)
         api(libs.lyricist.core)
       }
     }
 
-    val commonTest by getting {
+    commonTest {
       dependencies {
         implementation(kotlin("test"))
         implementation(libs.assertk)

diff --git a/common/ui/screens/build.gradle.kts b/common/ui/screens/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(libs.circuit.runtime)
       }

diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         api(projects.core.preferences)
       }
     }
 
-    val androidMain by getting {
+    androidMain {
       dependencies {
         implementation(libs.google.firebase.analytics)
         implementation(libs.kotlininject.runtime)

diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(libs.kotlin.coroutines.core)
         api(libs.kotlininject.runtime)
       }
     }
 
-    val jvmMain by getting
+    jvmMain
   }
 }
diff --git a/core/logging/api/build.gradle.kts b/core/logging/api/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(libs.kotlin.coroutines.core)
         api(libs.kotlinx.datetime)

diff --git a/core/logging/implementation/build.gradle.kts b/core/logging/implementation/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.core.base)
         api(projects.core.logging.api)
@@ -20,15 +20,15 @@ kotlin {
       }
     }
 
-    val androidMain by getting {
+    androidMain {
       dependencies {
         implementation(libs.crashkios.crashlytics)
         implementation(libs.google.firebase.crashlytics)
         implementation(libs.timber)
       }
     }
 
-    val iosMain by getting {
+    iosMain {
       dependencies {
         implementation(libs.crashkios.crashlytics)
       }

diff --git a/core/performance/build.gradle.kts b/core/performance/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         implementation(libs.kotlininject.runtime)
       }
     }
 
-    val androidMain by getting {
+    androidMain {
       dependencies {
         implementation(libs.google.firebase.perf)
       }

diff --git a/core/powercontroller/build.gradle.kts b/core/powercontroller/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         api(projects.core.preferences)
       }
     }
 
-    val androidMain by getting {
+    androidMain {
       dependencies {
         implementation(libs.androidx.core)
 

diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts
@@ -9,15 +9,15 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         api(libs.multiplatformsettings.core)
         api(libs.multiplatformsettings.coroutines)
       }
     }
 
-    val androidMain by getting {
+    androidMain {
       dependencies {
         implementation(libs.androidx.core)
         implementation(libs.kotlininject.runtime)

diff --git a/data/db-sqldelight/build.gradle.kts b/data/db-sqldelight/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         api(projects.data.db)
@@ -30,19 +30,19 @@ kotlin {
       }
     }
 
-    val androidMain by getting {
+    androidMain {
       dependencies {
         api(libs.sqldelight.android)
       }
     }
 
-    val jvmMain by getting {
+    jvmMain {
       dependencies {
         api(libs.sqldelight.sqlite)
       }
     }
 
-    val iosMain by getting {
+    iosMain {
       dependencies {
         api(libs.sqldelight.native)
 

diff --git a/data/db/build.gradle.kts b/data/db/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         implementation(projects.core.base)
         api(projects.data.models)

diff --git a/data/episodes/build.gradle.kts b/data/episodes/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.core.preferences)
         api(projects.data.models)

diff --git a/data/followedshows/build.gradle.kts b/data/followedshows/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.data.models)
         api(projects.data.traktauth)

diff --git a/data/legacy/build.gradle.kts b/data/legacy/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.core.base)
         api(projects.api.trakt)

diff --git a/data/licenses/build.gradle.kts b/data/licenses/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.core.base)
         api(projects.core.logging.api)

diff --git a/data/models/build.gradle.kts b/data/models/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
   sourceSets {
-    val commonMain by getting {
+    commonMain {
       dependencies {
         api(projects.core.base)
         api(libs.kotlinx.datetime)