Cleanup Gradle

DRSchlaubi · Aug 9, 2023 · 33a675f · 33a675f
1 parent 47ad183
commit 33a675f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 41 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
@@ -1,5 +1,4 @@
 import dev.schlaubi.tonbrett.gradle.sdkInt
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
 
 plugins {
     kotlin("android")
@@ -20,6 +19,10 @@ dependencies {
     implementation(libs.kotlinx.coroutines.play.services)
 }
 
+base {
+    archivesName = "tonbrett-app"
+}
+
 android {
     namespace = "dev.schlaubi.tonbrett.app.android"
     compileSdk = sdkInt
@@ -35,12 +38,6 @@ android {
         release {
             isMinifyEnabled = true
             proguardFile("proguard-rules.pro")
-
-            applicationVariants.all {
-                outputs.all {
-                    archivesName = "tonbrett-app"
-                }
-            }
         }
     }
     buildFeatures {

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,12 +1,3 @@
-plugins {
-    // this is necessary to avoid the plugins to be loaded multiple times
-    // in each subproject's classloader
-    kotlin("jvm") apply false
-    kotlin("multiplatform") apply false
-    kotlin("android") apply false
-    alias(libs.plugins.compose) apply false
-}
-
 allprojects {
     repositories {
         google()

diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
     implementation(libs.ktor.server.cors)
 }
 
-
 compose.desktop {
     application {
         mainClass = "dev.schlaubi.tonbrett.app.desktop.MainKt"
@@ -38,30 +37,30 @@ compose.desktop {
             packageVersion = project.version.toString()
 
             windows {
-                iconFile.set(rootProject.file("icons/logo.ico"))
+                iconFile = rootProject.file("icons/logo.ico")
                 menuGroup = "Tonbrett"
                 upgradeUuid = "c8bce0ed-113c-4d78-879b-78ed5c7d9f7f"
             }
 
             macOS {
-                iconFile.set(rootProject.file("icons/logo.icns"))
+                iconFile = rootProject.file("icons/logo.icns")
                 bundleID = "dev.schlaubi.tonbrett.app.mac"
                 entitlementsFile.set(file("entitlements.entitlements"))
                 appStore = false
                 signing {
                     identity = "Michael Rittmeister"
                 }
                 notarization {
-                    appleID.set("[email protected]")
-                    password.set(System.getenv("NOTARIZATION_PASSWORD"))
+                    appleID = "[email protected]"
+                    password = System.getenv("NOTARIZATION_PASSWORD")
                 }
             }
         }
 
         buildTypes {
             release {
                 proguard {
-                    version = "7.3.2"
+                    version = "7.3.3"
                     configurationFiles.from(files("rules.pro"))
                 }
             }

diff --git a/app/web/build.gradle.kts b/app/web/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
+import org.jetbrains.compose.ExperimentalComposeLibrary
 
 plugins {
     kotlin("multiplatform")
@@ -10,9 +10,11 @@ kotlin {
         browser()
         binaries.executable()
         compilations.all {
-            compilerOptions.options.freeCompilerArgs.addAll(
-                "-Xir-per-module", "-Xir-property-lazy-initialization"
-            )
+            compilerOptions.configure {
+                freeCompilerArgs.addAll(
+                    "-Xir-per-module", "-Xir-property-lazy-initialization"
+                )
+            }
         }
     }
 
@@ -28,7 +30,7 @@ kotlin {
                 implementation(compose.ui)
                 implementation(compose.foundation)
                 implementation(compose.material)
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+                @OptIn(ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
                 implementation(compose.materialIconsExtended)
             }
@@ -52,5 +54,3 @@ tasks {
 compose.experimental {
     web.application {}
 }
-
-rootProject.the<NodeJsRootExtension>().versions.webpack.version = "5.76.2"
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
@@ -1,5 +1,5 @@
 import dev.schlaubi.mikbot.gradle.mikbot
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import kotlin.io.path.div
 
 plugins {
     alias(libs.plugins.ksp)
@@ -19,6 +19,12 @@ dependencies {
     plugin(libs.mikbot.music)
 }
 
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.add("-Xcontext-receivers")
+    }
+}
+
 fun DependencyHandlerScope.ktorDependency(dependency: ProviderConvertible<*>) = ktorDependency(dependency.asProvider())
 fun DependencyHandlerScope.ktorDependency(dependency: Provider<*>) = implementation(dependency) {
     exclude(module = "ktor-server-core")
@@ -43,16 +49,10 @@ tasks {
         )
     }
 
-    withType<KotlinCompile> {
-        compilerOptions {
-            freeCompilerArgs.add("-Xcontext-receivers")
-        }
-    }
-
     val buildWebApp = register<Copy>("buildWebApp") {
         val webApp = project(":app:web")
-        from(webApp.tasks.getByName("jsBrowserDistribution"))
-        into(buildDir.resolve("resources").resolve("main").resolve("web"))
+        from(webApp.tasks.named("jsBrowserDistribution"))
+        into(buildDir.toPath() / "resources" / "main" / "web")
     }
 
     classes {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.compose) apply false
 }
 
 allprojects {

diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -1,6 +1,5 @@
 import dev.schlaubi.tonbrett.gradle.androidSdk
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
@@ -77,4 +76,8 @@ kotlin {
 android {
     namespace = "dev.schlaubi.tonbrett.client"
     compileSdkVersion = androidSdk
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
+    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
 }
 
 rootProject.name = "tonbrett"