[1.583.*] Pre-release merge (#1224)

android/lint-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
     <issue
         id="Instantiatable"

api/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

build-logic/build.gradle.kts

@@ -42,6 +42,10 @@ gradlePlugin {
       id = "dev.msfjarvis.claw.kotlin-jvm"
       implementationClass = "dev.msfjarvis.claw.gradle.KotlinJvmPlugin"
     }
+    register("kotlin-multiplatform") {
+      id = "dev.msfjarvis.claw.kotlin-multiplatform"
+      implementationClass = "dev.msfjarvis.claw.gradle.KotlinMultiplatformPlugin"
+    }
     register("rename-artifacts") {
       id = "dev.msfjarvis.claw.rename-artifacts"
       implementationClass = "dev.msfjarvis.claw.gradle.RenameArtifactsPlugin"

build-logic/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="false" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="false" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt

@@ -29,6 +29,7 @@ class AndroidCommonPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     project.configureSlimTests()
     project.pluginManager.apply(AndroidCacheFixPlugin::class)
+    project.pluginManager.apply(SpotlessPlugin::class)
     project.extensions.configure<CommonExtension> {
       compileSdk { version = release(COMPILE_SDK) }
       defaultConfig.apply {

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt

@@ -10,6 +10,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -18,6 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 class KotlinCommonPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
+    project.pluginManager.apply(SpotlessPlugin::class)
     project.tasks.run {
       withType<KotlinCompile>().configureEach {
         compilerOptions {

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinMultiplatformPlugin.kt

@@ -0,0 +1,28 @@
+package dev.msfjarvis.claw.gradle
+
+import com.android.build.api.dsl.Lint
+import com.android.build.gradle.LintPlugin
+import dev.msfjarvis.claw.gradle.LintConfig.configureLint
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
+import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
+
+@Suppress("Unused")
+class KotlinMultiplatformPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.pluginManager.apply {
+      apply(KotlinMultiplatformPluginWrapper::class)
+      apply(LintPlugin::class)
+    }
+    val extension = project.extensions.getByType<KotlinMultiplatformExtension>()
+    extension.targets.configureEach {
+      if (this is KotlinJvmTarget) {
+        project.extensions.getByType<Lint>().configureLint(project, isJVM = true)
+      }
+    }
+  }
+}

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.kt

@@ -11,6 +11,7 @@ import com.diffplug.gradle.spotless.SpotlessPlugin
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.file.RegularFile
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 
@@ -18,31 +19,33 @@ import org.gradle.kotlin.dsl.configure
 class SpotlessPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
-    if (project.isolated.rootProject != project.isolated) {
+    if (project.isolated.rootProject == project.isolated) {
       throw GradleException("Spotless plugin must only be applied to the root project.")
     }
+    val isolated = project.isolated
+    val rootFile: (String) -> RegularFile = { path ->
+      isolated.rootProject.projectDirectory.file(path)
+    }
     project.pluginManager.apply(SpotlessPlugin::class)
     project.extensions.configure<SpotlessExtension> {
       kotlin {
         ktfmt(KTFMT_VERSION).googleStyle()
-        target("**/*.kt")
-        targetExclude("**/build/", "/spotless/", "**/SentryNavigation3Integration.kt")
-        licenseHeaderFile(project.file("spotless/license.kt"))
+        target("src/**/*.kt")
+        targetExclude("**/SentryNavigation3Integration.kt")
+        licenseHeaderFile(rootFile("spotless/license.kt"))
       }
       kotlinGradle {
         ktfmt(KTFMT_VERSION).googleStyle()
-        target("**/*.kts")
-        targetExclude("**/build/")
-        licenseHeaderFile(project.file("spotless/license.kt"), "import|plugins|@file")
+        target("*.kts")
+        licenseHeaderFile(rootFile("spotless/license.kt"), "import|plugins|@file")
       }
       format("xml") {
-        target("**/*.xml")
-        targetExclude("**/build/", ".idea/", "/spotless/", "**/lint-baseline.xml")
+        target("src/**/*.xml")
         trimTrailingWhitespace()
         leadingTabsToSpaces()
         endWithNewline()
         licenseHeaderFile(
-          project.file("spotless/license.xml"),
+          rootFile("spotless/license.xml"),
           "<(adaptive-icon|appwidget-provider|data-extraction-rules|full-backup-content|manifest|network-security-config|vector|resources)",
         )
       }

build.gradle.kts

@@ -5,9 +5,7 @@
  * https://opensource.org/licenses/MIT.
  */
 plugins {
-  id("dev.msfjarvis.claw.spotless")
   id("dev.msfjarvis.claw.versions")
-  id("dev.msfjarvis.claw.kotlin-common")
   alias(libs.plugins.android.test) apply false
   alias(libs.plugins.dependencyAnalysis)
 }

common/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

core/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

database/core/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

database/impl/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 aboutLibraries = "15.0.3"
-agp = "9.4.0-alpha02"
+agp = "9.4.0-alpha03"
 androidx-test = "1.7.0"
 annotation = "1.10.0"
 coil3 = "3.5.0"

model/build.gradle.kts

@@ -7,7 +7,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
-  kotlin("multiplatform")
+  id("dev.msfjarvis.claw.kotlin-multiplatform")
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.dependencyAnalysis)
 }

model/lint-baseline.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
+
+</issues>

settings.gradle.kts

@@ -164,5 +164,4 @@ include(
   "model",
   "smoke-tests",
   "zipline-parser",
-  "zipline-parser-api",
 )

smoke-tests/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 9.3.0-rc01" type="baseline" client="gradle" dependencies="true" name="AGP (9.3.0-rc01)" variant="all" version="9.3.0-rc01">
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
 
 </issues>

zipline-parser-api/build.gradle.kts

@@ -1,29 +0,0 @@
-/*
- * Copyright © Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-plugins {
-  kotlin("multiplatform")
-}
-
-kotlin {
-  jvm()
-  js {
-    nodejs()
-  }
-
-  sourceSets {
-    commonMain {
-      dependencies {
-        api(libs.zipline)
-      }
-    }
-    jvmTest {
-      dependencies {
-        implementation(kotlin("test"))
-      }
-    }
-  }
-}

zipline-parser/build.gradle.kts

@@ -7,7 +7,7 @@
 import app.cash.zipline.loader.SignatureAlgorithmId
 
 plugins {
-  kotlin("multiplatform")
+  id("dev.msfjarvis.claw.kotlin-multiplatform")
   alias(libs.plugins.zipline)
 }
 
@@ -21,7 +21,7 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api(projects.ziplineParserApi)
+        api(libs.zipline)
         implementation(libs.ksoup)
       }
     }

zipline-parser/lint-baseline.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 9.4.0-alpha03" type="baseline" client="gradle" dependencies="true" name="AGP (9.4.0-alpha03)" variant="all" version="9.4.0-alpha03">
+
+</issues>