From 5d33bfc2eef298e4fe0a8c2ab5f33c6b4a1d6da4 Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 26 Nov 2024 14:37:01 +1100
Subject: [PATCH 1/7] Migrate accompanist to build-logic

---
 .idea/deploymentTargetSelector.xml            |  3 +
 .idea/kotlinc.xml                             |  2 +-
 adaptive/build.gradle.kts                     | 55 +----------
 build-logic/convention/build.gradle.kts       | 68 ++++++++++++++
 .../AndroidLibraryComposeConventionPlugin.kt  | 35 +++++++
 .../kotlin/AndroidLibraryConventionPlugin.kt  | 50 ++++++++++
 .../kotlin/AndroidLintConventionPlugin.kt     | 50 ++++++++++
 .../com/google/accompanist/AndroidCompose.kt  | 63 +++++++++++++
 .../com/google/accompanist/KotlinAndroid.kt   | 91 +++++++++++++++++++
 .../google/accompanist/ProjectExtensions.kt   | 25 +++++
 build-logic/gradle.properties                 |  5 +
 build-logic/settings.gradle.kts               | 30 ++++++
 build.gradle                                  | 29 +-----
 drawablepainter/build.gradle.kts              | 48 +---------
 gradle/libs.versions.toml                     | 14 ++-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 internal-testutils/build.gradle.kts           | 40 +-------
 .../internal/test/ActivityScenario.kt         |  2 +-
 .../accompanist/internal/test/Assertions.kt   |  8 +-
 .../internal/test/IgnoreOnRobolectric.kt      |  2 +-
 .../accompanist/internal/test/TestUtils.kt    |  4 +-
 .../accompanist/internal/test/WaitUntil.kt    |  2 +-
 navigation-animation/build.gradle.kts         | 57 +-----------
 navigation-material/build.gradle.kts          | 57 +-----------
 permissions-lint/build.gradle.kts             |  4 +-
 permissions/build.gradle.kts                  | 57 +-----------
 sample/build.gradle.kts                       | 18 ++--
 settings.gradle.kts                           | 26 ++++--
 systemuicontroller/build.gradle.kts           | 53 +----------
 testharness/build.gradle.kts                  | 52 +----------
 30 files changed, 509 insertions(+), 443 deletions(-)
 create mode 100644 build-logic/convention/build.gradle.kts
 create mode 100644 build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
 create mode 100644 build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt
 create mode 100644 build-logic/convention/src/main/kotlin/com/google/accompanist/ProjectExtensions.kt
 create mode 100644 build-logic/gradle.properties
 create mode 100644 build-logic/settings.gradle.kts

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index a670cf458..9f22ef434 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,6 +13,9 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
+      <SelectionState runConfigName="All Tests">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 8491b65fe..69c42ca7c 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.22" />
+    <option name="version" value="2.0.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/adaptive/build.gradle.kts b/adaptive/build.gradle.kts
index 39b13b961..9f21f72c9 100644
--- a/adaptive/build.gradle.kts
+++ b/adaptive/build.gradle.kts
@@ -16,65 +16,18 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
+
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.adaptive"
 
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-    }
-
-    packagingOptions {
-        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        animationsDisabled = true
-    }
-
     sourceSets {
         named("test") {
             java.srcDirs("src/sharedTest/kotlin")
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
new file mode 100644
index 000000000..52ab951dc
--- /dev/null
+++ b/build-logic/convention/build.gradle.kts
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    `kotlin-dsl`
+}
+
+group = "com.google.accompanist.buildlogic"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
+dependencies {
+    compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.android.tools.common)
+    compileOnly(libs.compose.gradlePlugin)
+    compileOnly(libs.kotlin.gradlePlugin)
+    implementation(libs.truth)
+}
+
+tasks {
+    validatePlugins {
+        enableStricterValidation = true
+        failOnWarning = true
+    }
+}
+
+gradlePlugin {
+    plugins {
+        register("androidLibrary") {
+            id = "accompanist.android.library"
+            implementationClass = "AndroidLibraryConventionPlugin"
+        }
+        register("androidLibraryCompose") {
+            id = "accompanist.android.library.compose"
+            implementationClass = "AndroidLibraryComposeConventionPlugin"
+        }
+        register("androidLint") {
+            id = "accompanist.android.lint"
+            implementationClass = "AndroidLintConventionPlugin"
+        }
+    }
+}
+
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
new file mode 100644
index 000000000..20c763bc8
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.android.build.gradle.LibraryExtension
+import com.google.accompanist.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            apply(plugin = "com.android.library")
+            apply(plugin = "org.jetbrains.kotlin.plugin.compose")
+
+            val extension = extensions.getByType<LibraryExtension>()
+            configureAndroidCompose(extension)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
new file mode 100644
index 000000000..0eff9ed45
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+import com.android.build.gradle.LibraryExtension
+import com.google.accompanist.configureKotlinAndroid
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.kotlin
+
+class AndroidLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+                apply("org.jetbrains.kotlin.android")
+            }
+
+            extensions.configure<LibraryExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = 34
+                defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                buildFeatures.buildConfig = false
+
+                testOptions.animationsDisabled = true
+                // The resource prefix is derived from the module name,
+                // so resources inside ":core:module1" must be prefixed with "core_module1_"
+                resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_"
+            }
+            dependencies {
+                add("androidTestImplementation", kotlin("test"))
+                add("testImplementation", kotlin("test"))
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
new file mode 100644
index 000000000..12802a350
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.dsl.Lint
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import java.io.File
+
+class AndroidLintConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            when {
+                pluginManager.hasPlugin("com.android.application") ->
+                    configure<ApplicationExtension> { lint(Lint::configure) }
+
+                pluginManager.hasPlugin("com.android.library") ->
+                    configure<LibraryExtension> { lint(Lint::configure) }
+
+                else -> {
+                    pluginManager.apply("com.android.lint")
+                    configure<Lint>(Lint::configure)
+                }
+            }
+        }
+    }
+}
+
+private fun Lint.configure() {
+    textReport = true
+    textOutput = File("stdout")
+    // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
+    checkReleaseBuilds = false
+    disable += setOf("GradleOverrides")
+}
diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
new file mode 100644
index 000000000..cebdc248b
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.accompanist
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+
+/**
+ * Configure Compose-specific options
+ */
+internal fun Project.configureAndroidCompose(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    commonExtension.apply {
+        buildFeatures {
+            compose = true
+        }
+
+        dependencies {
+        }
+
+        testOptions {
+            unitTests {
+                // For Robolectric
+                isIncludeAndroidResources = true
+            }
+        }
+    }
+
+    extensions.configure<ComposeCompilerGradlePluginExtension> {
+        fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } }
+        fun Provider<*>.relativeToRootProject(dir: String) = flatMap {
+            rootProject.layout.buildDirectory.dir(projectDir.toRelativeString(rootDir))
+        }.map { it.dir(dir) }
+
+        project.providers.gradleProperty("enableComposeCompilerMetrics").onlyIfTrue()
+            .relativeToRootProject("compose-metrics")
+            .let(metricsDestination::set)
+
+        project.providers.gradleProperty("enableComposeCompilerReports").onlyIfTrue()
+            .relativeToRootProject("compose-reports")
+            .let(reportsDestination::set)
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt
new file mode 100644
index 000000000..787afad69
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.accompanist
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.provideDelegate
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
+
+/**
+ * Configure base Kotlin with Android options
+ */
+internal fun Project.configureKotlinAndroid(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    commonExtension.apply {
+        compileSdk = 34
+
+        defaultConfig {
+            minSdk = 21
+        }
+
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_1_8
+        }
+    }
+
+    configureKotlin<KotlinAndroidProjectExtension>()
+
+    dependencies {
+    }
+}
+
+/**
+ * Configure base Kotlin options for JVM (non-Android)
+ */
+internal fun Project.configureKotlinJvm() {
+    extensions.configure<JavaPluginExtension> {
+        // Up to Java 11 APIs are available through desugaring
+        // https://developer.android.com/studio/write/java11-minimal-support-table
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    configureKotlin<KotlinJvmProjectExtension>()
+}
+
+/**
+ * Configure base Kotlin options
+ */
+private inline fun <reified T : KotlinTopLevelExtension> Project.configureKotlin() = configure<T> {
+    // Treat all Kotlin warnings as errors (disabled by default)
+    // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+    val warningsAsErrors: String? by project
+    when (this) {
+        is KotlinAndroidProjectExtension -> compilerOptions
+        is KotlinJvmProjectExtension -> compilerOptions
+        else -> TODO("Unsupported project extension $this ${T::class}")
+    }.apply {
+        jvmTarget = JvmTarget.JVM_1_8
+        allWarningsAsErrors = warningsAsErrors.toBoolean()
+        freeCompilerArgs.add(
+            // Enable experimental coroutines APIs, including Flow
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+        )
+        explicitApi()
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/ProjectExtensions.kt
new file mode 100644
index 000000000..be2a68074
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/google/accompanist/ProjectExtensions.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.accompanist
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
+
+val Project.libs
+    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
\ No newline at end of file
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
new file mode 100644
index 000000000..201d4afa8
--- /dev/null
+++ b/build-logic/gradle.properties
@@ -0,0 +1,5 @@
+# Gradle properties are not passed to included builds https://github.com/gradle/gradle/issues/2534
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true
+
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
new file mode 100644
index 000000000..4e6bd9fd9
--- /dev/null
+++ b/build-logic/settings.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"
+include(":convention")
diff --git a/build.gradle b/build.gradle
index c1c80c0b7..799a5b340 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,10 @@ buildscript {
 plugins {
     id "com.diffplug.spotless" version "6.5.2"
     alias(libs.plugins.jetbrains.dokka)
+    alias(libs.plugins.compose.plugin) apply false
+    alias(libs.plugins.accompanist.android.library) apply false
+    alias(libs.plugins.accompanist.android.library.compose) apply false
+    alias(libs.plugins.accompanist.android.lint) apply false
 }
 
 apply plugin: 'com.dropbox.affectedmoduledetector'
@@ -72,18 +76,6 @@ affectedModuleDetector {
     }
 }
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-
-        def composeSnapshot = libs.versions.composesnapshot.get()
-        if (composeSnapshot.length() > 1) {
-            maven { url "https://androidx.dev/snapshots/builds/$composeSnapshot/artifacts/repository/" }
-        }
-    }
-}
-
 subprojects {
     apply plugin: 'com.diffplug.spotless'
 
@@ -121,19 +113,6 @@ subprojects {
         }
     }
 
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
-        kotlinOptions {
-            // Treat all Kotlin warnings as errors
-            allWarningsAsErrors = true
-            // Set JVM target to 1.8
-            jvmTarget = "1.8"
-            // Allow use of @OptIn
-            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-            // Enable default methods in interfaces
-            freeCompilerArgs += "-Xjvm-default=all"
-        }
-    }
-
     // Read in the signing.properties file if it is exists
     def signingPropsFile = rootProject.file('release/signing.properties')
     if (signingPropsFile.exists()) {
diff --git a/drawablepainter/build.gradle.kts b/drawablepainter/build.gradle.kts
index 50e314566..77978b338 100644
--- a/drawablepainter/build.gradle.kts
+++ b/drawablepainter/build.gradle.kts
@@ -16,57 +16,17 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
+
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.drawablepainter"
-
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-        disable += setOf("GradleOverrides")
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        animationsDisabled = true
-    }
 }
 
 metalava {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 049acc236..80a3cf387 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,11 +8,12 @@ composesnapshot = "-" # a single character = no snapshot
 dokka = "1.8.10"
 
 # gradlePlugin and lint need to be updated together
-gradlePlugin = "8.5.2"
+androidTools = "31.7.2"
+gradlePlugin = "8.7.2"
 lintMinCompose = "30.0.0"
 
 ktlint = "0.45.2"
-kotlin = "1.9.22"
+kotlin = "2.0.20"
 coroutines = "1.6.4"
 okhttp = "3.12.13"
 coil = "1.3.2"
@@ -39,6 +40,7 @@ compose-material-material = { module = "androidx.compose.material:material", ver
 compose-material-iconsext = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
 compose-material3-material3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial3" }
 compose-animation-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
+compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 
 snapper = "dev.chrisbanes.snapper:snapper:0.2.2"
 
@@ -97,6 +99,7 @@ robolectric = "org.robolectric:robolectric:4.12.1"
 
 affectedmoduledetector = "com.dropbox.affectedmoduledetector:affectedmoduledetector:0.1.2"
 
+android-tools-common = { module = "com.android.tools:common", version.ref = "androidTools" }
 android-tools-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
 android-tools-lint-lint = { module = "com.android.tools.lint:lint", version.ref = "lintMinCompose" }
 android-tools-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lintMinCompose" }
@@ -112,3 +115,10 @@ android-lint = { id = "com.android.lint", version.ref = "androidlint"}
 jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 gradle-metalava = { id = "me.tylerbwong.gradle.metalava", version.ref = "metalava" }
 vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktechPublish" }
+compose-plugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
+#build-logic plugins
+accompanist-android-application-compose = { id = "accompanist.android.application.compose" }
+accompanist-android-library = { id = "accompanist.android.library" }
+accompanist-android-library-compose = { id = "accompanist.android.library.compose" }
+accompanist-android-lint = { id = "accompanist.android.lint" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d62b91ae6..a3522b335 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Wed Jul 10 11:49:25 AEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/internal-testutils/build.gradle.kts b/internal-testutils/build.gradle.kts
index a241e2067..7d1f4526b 100644
--- a/internal-testutils/build.gradle.kts
+++ b/internal-testutils/build.gradle.kts
@@ -16,47 +16,13 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
     namespace = "com.google.accompanist.internal.test"
-
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-    }
-    packaging {
-        // Certain libraries include licence files in their JARs. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
 }
 
 dependencies {
diff --git a/internal-testutils/src/main/java/com/google/accompanist/internal/test/ActivityScenario.kt b/internal-testutils/src/main/java/com/google/accompanist/internal/test/ActivityScenario.kt
index a8414e10a..2bbb76d3d 100644
--- a/internal-testutils/src/main/java/com/google/accompanist/internal/test/ActivityScenario.kt
+++ b/internal-testutils/src/main/java/com/google/accompanist/internal/test/ActivityScenario.kt
@@ -19,7 +19,7 @@ package com.google.accompanist.internal.test
 import android.app.Activity
 import androidx.test.core.app.ActivityScenario
 
-fun <A : Activity, T : Any> ActivityScenario<A>.withActivity(
+public fun <A : Activity, T : Any> ActivityScenario<A>.withActivity(
     action: (A) -> T
 ): T {
     lateinit var result: T
diff --git a/internal-testutils/src/main/java/com/google/accompanist/internal/test/Assertions.kt b/internal-testutils/src/main/java/com/google/accompanist/internal/test/Assertions.kt
index 6bb2b2ce7..170df349b 100644
--- a/internal-testutils/src/main/java/com/google/accompanist/internal/test/Assertions.kt
+++ b/internal-testutils/src/main/java/com/google/accompanist/internal/test/Assertions.kt
@@ -28,7 +28,7 @@ import com.google.common.truth.Truth.assertThat
 /**
  * Assert that all of the pixels in this image as of the [expected] color.
  */
-fun ImageBitmap.assertPixels(expected: Color, tolerance: Float = 0.001f) {
+public fun ImageBitmap.assertPixels(expected: Color, tolerance: Float = 0.001f) {
     toPixelMap().buffer.forEach { pixel ->
         val color = Color(pixel)
         assertThat(color.red).isWithin(tolerance).of(expected.red)
@@ -42,7 +42,7 @@ fun ImageBitmap.assertPixels(expected: Color, tolerance: Float = 0.001f) {
  * Run the [SemanticsNodeInteraction] provided by [block] repeatedly until either
  * the assertion succeeds, or the execution runs past [timeoutMillis].
  */
-fun SemanticsNodeInteraction.assertWithTimeout(
+public fun SemanticsNodeInteraction.assertWithTimeout(
     timeoutMillis: Long,
     block: SemanticsNodeInteraction.() -> SemanticsNodeInteraction,
 ): SemanticsNodeInteraction {
@@ -60,7 +60,7 @@ fun SemanticsNodeInteraction.assertWithTimeout(
     return block()
 }
 
-val SemanticsNodeInteraction.exists: Boolean
+public val SemanticsNodeInteraction.exists: Boolean
     get() = try {
         assertExists()
         true
@@ -68,7 +68,7 @@ val SemanticsNodeInteraction.exists: Boolean
         false
     }
 
-val SemanticsNodeInteraction.isLaidOut: Boolean
+public val SemanticsNodeInteraction.isLaidOut: Boolean
     get() = try {
         assertWidthIsAtLeast(Dp.Hairline).assertHeightIsAtLeast(Dp.Hairline)
         true
diff --git a/internal-testutils/src/main/java/com/google/accompanist/internal/test/IgnoreOnRobolectric.kt b/internal-testutils/src/main/java/com/google/accompanist/internal/test/IgnoreOnRobolectric.kt
index a4990875e..a8d6e9840 100644
--- a/internal-testutils/src/main/java/com/google/accompanist/internal/test/IgnoreOnRobolectric.kt
+++ b/internal-testutils/src/main/java/com/google/accompanist/internal/test/IgnoreOnRobolectric.kt
@@ -19,4 +19,4 @@ package com.google.accompanist.internal.test
 /**
  * Marker interface to use as a category for filtering out tests when running on Robolectric.
  */
-interface IgnoreOnRobolectric
+public interface IgnoreOnRobolectric
diff --git a/internal-testutils/src/main/java/com/google/accompanist/internal/test/TestUtils.kt b/internal-testutils/src/main/java/com/google/accompanist/internal/test/TestUtils.kt
index 9dea72af9..4bde31d80 100644
--- a/internal-testutils/src/main/java/com/google/accompanist/internal/test/TestUtils.kt
+++ b/internal-testutils/src/main/java/com/google/accompanist/internal/test/TestUtils.kt
@@ -18,9 +18,9 @@
 
 package com.google.accompanist.internal.test
 
-inline fun parameterizedParams(): List<Array<Any>> = emptyList()
+public inline fun parameterizedParams(): List<Array<Any>> = emptyList()
 
-inline fun <reified T> List<Array<T>>.combineWithParameters(
+public inline fun <reified T> List<Array<T>>.combineWithParameters(
     vararg values: T
 ): List<Array<T>> {
     if (isEmpty()) {
diff --git a/internal-testutils/src/main/java/com/google/accompanist/internal/test/WaitUntil.kt b/internal-testutils/src/main/java/com/google/accompanist/internal/test/WaitUntil.kt
index ea22ee209..7d38e21f3 100644
--- a/internal-testutils/src/main/java/com/google/accompanist/internal/test/WaitUntil.kt
+++ b/internal-testutils/src/main/java/com/google/accompanist/internal/test/WaitUntil.kt
@@ -20,7 +20,7 @@ import android.os.Looper
 import com.google.common.truth.Truth.assertThat
 import java.util.concurrent.TimeoutException
 
-fun waitUntil(timeoutMillis: Long = 2_000, condition: () -> Boolean) {
+public fun waitUntil(timeoutMillis: Long = 2_000, condition: () -> Boolean) {
     if (Looper.getMainLooper() == Looper.myLooper()) {
         assertThat(condition()).isTrue()
     }
diff --git a/navigation-animation/build.gradle.kts b/navigation-animation/build.gradle.kts
index d65aaa14a..2d359c4dc 100644
--- a/navigation-animation/build.gradle.kts
+++ b/navigation-animation/build.gradle.kts
@@ -16,66 +16,17 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
+
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.navigation.animation"
-
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-        disable += setOf("GradleOverrides")
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        animationsDisabled = true
-    }
-
-    packaging {
-        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
 }
 
 metalava {
diff --git a/navigation-material/build.gradle.kts b/navigation-material/build.gradle.kts
index c3f9b93dc..364331145 100644
--- a/navigation-material/build.gradle.kts
+++ b/navigation-material/build.gradle.kts
@@ -16,66 +16,17 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
+
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.navigation.material"
-
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-        disable += setOf("GradleOverrides")
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        animationsDisabled = true
-    }
-
-    packaging {
-        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
 }
 
 metalava {
diff --git a/permissions-lint/build.gradle.kts b/permissions-lint/build.gradle.kts
index fa7376da1..487ddc3bb 100644
--- a/permissions-lint/build.gradle.kts
+++ b/permissions-lint/build.gradle.kts
@@ -83,6 +83,6 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
\ No newline at end of file
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index 26dc1bb5a..bf60969be 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -16,71 +16,20 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.permissions"
 
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        // The following argument makes the Android Test Orchestrator run its
-        // "pm clear" command after each test invocation. This command ensures
-        // that the app's state is completely cleared between tests.
-        testInstrumentationRunnerArguments["clearPackageData"] = "true"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-        disable += setOf("GradleOverrides")
-    }
-
     testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        animationsDisabled = true
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }
-
-    packaging {
-        // Exclude license files to enable our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
 }
 
 metalava {
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 9ff319594..125def668 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -15,9 +15,13 @@
  */
 @file:Suppress("UnstableApiUsage")
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+
 plugins {
     id(libs.plugins.android.application.get().pluginId)
     id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.compose.plugin)
 }
 
 android {
@@ -26,7 +30,7 @@ android {
     defaultConfig {
         applicationId = "com.google.accompanist.sample"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
 
         versionCode = 1
         versionName = "1.0"
@@ -35,24 +39,24 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     buildTypes {
         getByName("release") {
             signingConfig = signingConfigs.getByName("debug")
         }
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     namespace = "com.google.accompanist.sample"
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 464abe5e1..f9b920541 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,14 +14,20 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.gradle.enterprise").version("3.10.3")
+pluginManagement {
+    includeBuild("build-logic")
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-gradleEnterprise {
-    buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+dependencyResolutionManagement {
+    repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
+    repositories {
+        google()
+        mavenCentral()
     }
 }
 
@@ -38,3 +44,11 @@ include(":sample")
 include(":testharness")
 
 rootProject.name = "accompanist"
+
+check(JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+    """
+    Accompanist requires JDK 17+ but it is currently using JDK ${JavaVersion.current()}.
+    Java Home: [${System.getProperty("java.home")}]
+    https://developer.android.com/build/jdks#jdk-config-in-studio
+    """.trimIndent()
+}
\ No newline at end of file
diff --git a/systemuicontroller/build.gradle.kts b/systemuicontroller/build.gradle.kts
index 3c31292b6..2d42d7bd6 100644
--- a/systemuicontroller/build.gradle.kts
+++ b/systemuicontroller/build.gradle.kts
@@ -16,69 +16,24 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
+
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.systemuicontroller"
 
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-        disable += setOf("GradleOverrides")
-    }
-
-    packaging {
-        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
-
     testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
         unitTests.all {
             it.useJUnit {
                 excludeCategories("com.google.accompanist.internal.test.IgnoreOnRobolectric")
             }
         }
-        animationsDisabled = true
     }
 
     sourceSets {
diff --git a/testharness/build.gradle.kts b/testharness/build.gradle.kts
index 8982897dd..4f2ecb289 100644
--- a/testharness/build.gradle.kts
+++ b/testharness/build.gradle.kts
@@ -16,75 +16,29 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
-    id(libs.plugins.android.kotlin.get().pluginId)
+    alias(libs.plugins.accompanist.android.library)
+    alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.lint)
     id(libs.plugins.jetbrains.dokka.get().pluginId)
     id(libs.plugins.gradle.metalava.get().pluginId)
     id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 android {
     namespace = "com.google.accompanist.testharness"
 
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        // targetSdkVersion has no effect for libraries. This is only used for the test APK
-        targetSdk = 33
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
     buildTypes {
         getByName("debug") {
             enableUnitTestCoverage = true
         }
     }
 
-    buildFeatures {
-        buildConfig = false
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
-    lint {
-        textReport = true
-        textOutput = File("stdout")
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
-        checkReleaseBuilds = false
-        disable += setOf("GradleOverrides")
-    }
-
-    packaging {
-        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        resources {
-            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
-        }
-    }
-
     testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
         unitTests.all {
             it.useJUnit {
                 excludeCategories("com.google.accompanist.internal.test.IgnoreOnRobolectric")
             }
         }
-        animationsDisabled = true
     }
 
     sourceSets {

From d7ae815c441c0ebe1572d52ac60fa6e033b8f308 Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 26 Nov 2024 15:16:50 +1100
Subject: [PATCH 2/7] Enable source information

---
 .../src/main/kotlin/com/google/accompanist/AndroidCompose.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
index cebdc248b..d5307b08d 100644
--- a/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
@@ -19,7 +19,6 @@ package com.google.accompanist
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
-import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
@@ -59,5 +58,9 @@ internal fun Project.configureAndroidCompose(
         project.providers.gradleProperty("enableComposeCompilerReports").onlyIfTrue()
             .relativeToRootProject("compose-reports")
             .let(reportsDestination::set)
+
+        // We include source information to match how the main Compose libraries are shipped.
+        // This allows accompanist to be displayed properly in the layout inspector and systrace
+        includeSourceInformation.set(true)
     }
 }

From d54e2b596a8c72560bf6bd49a5e107e7095a1cfa Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 26 Nov 2024 15:48:01 +1100
Subject: [PATCH 3/7] Add published library convention plugin

---
 adaptive/build.gradle.kts                     | 11 +-----
 build-logic/convention/build.gradle.kts       |  5 +++
 .../kotlin/AndroidLibraryConventionPlugin.kt  |  4 ++
 ...AndroidLibraryPublishedConventionPlugin.kt | 38 +++++++++++++++++++
 build-logic/settings.gradle.kts               |  1 +
 build.gradle                                  | 18 ++++-----
 drawablepainter/build.gradle.kts              | 11 +-----
 gradle/libs.versions.toml                     |  4 +-
 navigation-animation/build.gradle.kts         | 11 +-----
 navigation-material/build.gradle.kts          | 11 +-----
 permissions/build.gradle.kts                  | 10 +----
 .../google/accompanist/sample/MainActivity.kt |  1 +
 settings.gradle.kts                           |  1 -
 systemuicontroller/build.gradle.kts           | 11 +-----
 testharness/build.gradle.kts                  | 10 +----
 15 files changed, 66 insertions(+), 81 deletions(-)
 create mode 100644 build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt

diff --git a/adaptive/build.gradle.kts b/adaptive/build.gradle.kts
index 9f21f72c9..b518ff815 100644
--- a/adaptive/build.gradle.kts
+++ b/adaptive/build.gradle.kts
@@ -18,11 +18,8 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
@@ -40,12 +37,6 @@ android {
     }
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     api(libs.compose.foundation.foundation)
     api(libs.compose.ui.ui)
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index 52ab951dc..43b143d67 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
     compileOnly(libs.android.tools.common)
     compileOnly(libs.compose.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.metalavaGradle)
     implementation(libs.truth)
 }
 
@@ -63,6 +64,10 @@ gradlePlugin {
             id = "accompanist.android.lint"
             implementationClass = "AndroidLintConventionPlugin"
         }
+        register("androidLibraryPublished") {
+            id = "accompanist.android.library.published"
+            implementationClass = "AndroidLibraryPublishedConventionPlugin"
+        }
     }
 }
 
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index 0eff9ed45..aa84449e0 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -16,6 +16,8 @@
 
 import com.android.build.gradle.LibraryExtension
 import com.google.accompanist.configureKotlinAndroid
+import com.google.accompanist.libs
+import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -34,6 +36,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 34
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
                 buildFeatures.buildConfig = false
 
                 testOptions.animationsDisabled = true
@@ -41,6 +44,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 // so resources inside ":core:module1" must be prefixed with "core_module1_"
                 resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_"
             }
+
             dependencies {
                 add("androidTestImplementation", kotlin("test"))
                 add("testImplementation", kotlin("test"))
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
new file mode 100644
index 000000000..a9d1cbce3
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
@@ -0,0 +1,38 @@
+import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class AndroidLibraryPublishedConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("me.tylerbwong.gradle.metalava")
+                apply("org.jetbrains.dokka")
+                apply("com.vanniktech.maven.publish")
+            }
+
+            extensions.configure<MetalavaExtension> {
+                sourcePaths.setFrom("src/main")
+                filename.set("api/current.api")
+                reportLintsAsErrors.set(true)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 4e6bd9fd9..27abf0f12 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -18,6 +18,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
     versionCatalogs {
         create("libs") {
diff --git a/build.gradle b/build.gradle
index 799a5b340..55cfdb945 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
+
 /*
  * Copyright 2020 The Android Open Source Project
  *
@@ -18,35 +20,31 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        gradlePluginPortal()
     }
 
     dependencies {
-        classpath libs.android.tools.build.gradle
-        classpath libs.android.gradlePlugin
-        classpath libs.kotlin.gradlePlugin
-
-        classpath libs.gradleMavenPublishPlugin
-
-        classpath libs.metalavaGradle
-
         classpath libs.affectedmoduledetector
     }
 }
 
 plugins {
     id "com.diffplug.spotless" version "6.5.2"
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.kotlin) apply false
     alias(libs.plugins.jetbrains.dokka)
     alias(libs.plugins.compose.plugin) apply false
     alias(libs.plugins.accompanist.android.library) apply false
     alias(libs.plugins.accompanist.android.library.compose) apply false
+    alias(libs.plugins.accompanist.android.library.published) apply false
     alias(libs.plugins.accompanist.android.lint) apply false
+    alias(libs.plugins.gradle.metalava) apply false
+    alias(libs.plugins.vanniktech.maven.publish) apply false
 }
 
 apply plugin: 'com.dropbox.affectedmoduledetector'
 apply plugin: 'com.diffplug.spotless'
 
-tasks.withType(org.jetbrains.dokka.gradle.DokkaMultiModuleTask).configureEach {
+tasks.withType(DokkaMultiModuleTask).configureEach {
     outputDirectory = rootProject.file('docs/api')
     failOnWarning = true
 }
diff --git a/drawablepainter/build.gradle.kts b/drawablepainter/build.gradle.kts
index 77978b338..1896a72c3 100644
--- a/drawablepainter/build.gradle.kts
+++ b/drawablepainter/build.gradle.kts
@@ -18,23 +18,14 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
     namespace = "com.google.accompanist.drawablepainter"
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     implementation(libs.compose.ui.ui)
     implementation(libs.kotlin.coroutines.android)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 80a3cf387..5fd11fdb8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ androidxtest = "1.6.1"
 androidxnavigation = "2.7.7"
 androidxWindow = "1.0.0"
 
-metalava = "0.3.2"
+metalava = "0.3.5"
 vanniktechPublish = "0.25.2"
 
 [libraries]
@@ -118,7 +118,7 @@ vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref =
 compose-plugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 #build-logic plugins
-accompanist-android-application-compose = { id = "accompanist.android.application.compose" }
 accompanist-android-library = { id = "accompanist.android.library" }
 accompanist-android-library-compose = { id = "accompanist.android.library.compose" }
+accompanist-android-library-published = { id = "accompanist.android.library.published" }
 accompanist-android-lint = { id = "accompanist.android.lint" }
diff --git a/navigation-animation/build.gradle.kts b/navigation-animation/build.gradle.kts
index 2d359c4dc..f63e085ae 100644
--- a/navigation-animation/build.gradle.kts
+++ b/navigation-animation/build.gradle.kts
@@ -18,23 +18,14 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
     namespace = "com.google.accompanist.navigation.animation"
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     api(libs.androidx.navigation.compose)
     implementation(libs.compose.animation.animation)
diff --git a/navigation-material/build.gradle.kts b/navigation-material/build.gradle.kts
index 364331145..f73727fc2 100644
--- a/navigation-material/build.gradle.kts
+++ b/navigation-material/build.gradle.kts
@@ -18,23 +18,14 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
     namespace = "com.google.accompanist.navigation.material"
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     api(libs.androidx.navigation.compose)
     implementation(libs.compose.foundation.foundation)
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index bf60969be..4d34446e4 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -18,10 +18,8 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
@@ -32,12 +30,6 @@ android {
     }
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.compose.foundation.foundation)
diff --git a/sample/src/main/java/com/google/accompanist/sample/MainActivity.kt b/sample/src/main/java/com/google/accompanist/sample/MainActivity.kt
index d682a2d0e..951ef8193 100644
--- a/sample/src/main/java/com/google/accompanist/sample/MainActivity.kt
+++ b/sample/src/main/java/com/google/accompanist/sample/MainActivity.kt
@@ -127,6 +127,7 @@ class MainActivity : ListActivity() {
         data += temp
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onListItemClick(l: ListView, v: View, position: Int, id: Long) {
         val map = l.getItemAtPosition(position) as Map<*, *>
         val intent = map["intent"] as Intent?
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f9b920541..770e56349 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,7 +24,6 @@ pluginManagement {
 }
 
 dependencyResolutionManagement {
-    repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
     repositories {
         google()
         mavenCentral()
diff --git a/systemuicontroller/build.gradle.kts b/systemuicontroller/build.gradle.kts
index 2d42d7bd6..252b8f877 100644
--- a/systemuicontroller/build.gradle.kts
+++ b/systemuicontroller/build.gradle.kts
@@ -18,11 +18,8 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
@@ -48,12 +45,6 @@ android {
     }
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     implementation(libs.androidx.core)
     implementation(libs.compose.ui.ui)
diff --git a/testharness/build.gradle.kts b/testharness/build.gradle.kts
index 4f2ecb289..1c0d45315 100644
--- a/testharness/build.gradle.kts
+++ b/testharness/build.gradle.kts
@@ -18,10 +18,8 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
+    alias(libs.plugins.accompanist.android.library.published)
     alias(libs.plugins.accompanist.android.lint)
-    id(libs.plugins.jetbrains.dokka.get().pluginId)
-    id(libs.plugins.gradle.metalava.get().pluginId)
-    id(libs.plugins.vanniktech.maven.publish.get().pluginId)
 }
 
 android {
@@ -53,12 +51,6 @@ android {
     }
 }
 
-metalava {
-    sourcePaths.setFrom("src/main")
-    filename.set("api/current.api")
-    reportLintsAsErrors.set(true)
-}
-
 dependencies {
     implementation(libs.compose.foundation.foundation)
     implementation(libs.androidx.core)

From 4fd5d33383463ccf4c71a2e447a21bee8ac113a4 Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 26 Nov 2024 16:51:36 +1100
Subject: [PATCH 4/7] Update API

---
 adaptive/api/current.api             |  7 ++-----
 navigation-animation/api/current.api |  2 +-
 navigation-material/api/current.api  | 13 +++++--------
 permissions/api/current.api          |  6 ------
 systemuicontroller/api/current.api   | 16 ++++++++--------
 5 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/adaptive/api/current.api b/adaptive/api/current.api
index 542f42db6..63299f418 100644
--- a/adaptive/api/current.api
+++ b/adaptive/api/current.api
@@ -29,9 +29,6 @@ package com.google.accompanist.adaptive {
     property public final int VerticalFoldsOnly;
   }
 
-  public final class RowColumnImplKt {
-  }
-
   public final class SplitResult {
     ctor public SplitResult(androidx.compose.foundation.gestures.Orientation gapOrientation, androidx.compose.ui.geometry.Rect gapBounds);
     method public androidx.compose.ui.geometry.Rect getGapBounds();
@@ -41,11 +38,11 @@ package com.google.accompanist.adaptive {
   }
 
   public final class TwoPaneKt {
-    method public static com.google.accompanist.adaptive.TwoPaneStrategy HorizontalTwoPaneStrategy(float splitFraction, optional float gapWidth);
     method public static com.google.accompanist.adaptive.TwoPaneStrategy HorizontalTwoPaneStrategy(float splitOffset, optional boolean offsetFromStart, optional float gapWidth);
+    method public static com.google.accompanist.adaptive.TwoPaneStrategy HorizontalTwoPaneStrategy(float splitFraction, optional float gapWidth);
     method @androidx.compose.runtime.Composable public static void TwoPane(kotlin.jvm.functions.Function0<kotlin.Unit> first, kotlin.jvm.functions.Function0<kotlin.Unit> second, com.google.accompanist.adaptive.TwoPaneStrategy strategy, java.util.List<? extends androidx.window.layout.DisplayFeature> displayFeatures, optional androidx.compose.ui.Modifier modifier, optional int foldAwareConfiguration);
-    method public static com.google.accompanist.adaptive.TwoPaneStrategy VerticalTwoPaneStrategy(float splitFraction, optional float gapHeight);
     method public static com.google.accompanist.adaptive.TwoPaneStrategy VerticalTwoPaneStrategy(float splitOffset, optional boolean offsetFromTop, optional float gapHeight);
+    method public static com.google.accompanist.adaptive.TwoPaneStrategy VerticalTwoPaneStrategy(float splitFraction, optional float gapHeight);
   }
 
   public fun interface TwoPaneStrategy {
diff --git a/navigation-animation/api/current.api b/navigation-animation/api/current.api
index 55028ef00..f4c2e92f2 100644
--- a/navigation-animation/api/current.api
+++ b/navigation-animation/api/current.api
@@ -15,8 +15,8 @@ package com.google.accompanist.navigation.animation {
   }
 
   public final class AnimatedNavHostKt {
-    method @Deprecated @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedNavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional String? route, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> popExitTransition, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
     method @Deprecated @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedNavHost(androidx.navigation.NavHostController navController, androidx.navigation.NavGraph graph, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> popExitTransition);
+    method @Deprecated @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public static void AnimatedNavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional String? route, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> popExitTransition, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class NavGraphBuilderKt {
diff --git a/navigation-material/api/current.api b/navigation-material/api/current.api
index 11662059c..8954f5cb3 100644
--- a/navigation-material/api/current.api
+++ b/navigation-material/api/current.api
@@ -10,8 +10,8 @@ package com.google.accompanist.navigation.material {
     method @Deprecated public com.google.accompanist.navigation.material.BottomSheetNavigator.Destination createDestination();
     method @Deprecated public com.google.accompanist.navigation.material.BottomSheetNavigatorSheetState getNavigatorSheetState();
     method @Deprecated public kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> getSheetContent();
-    property public final com.google.accompanist.navigation.material.BottomSheetNavigatorSheetState navigatorSheetState;
-    property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> sheetContent;
+    property @Deprecated public final com.google.accompanist.navigation.material.BottomSheetNavigatorSheetState navigatorSheetState;
+    property @Deprecated public final kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> sheetContent;
   }
 
   @Deprecated @androidx.navigation.NavDestination.ClassType(Composable::class) public static final class BottomSheetNavigator.Destination extends androidx.navigation.NavDestination implements androidx.navigation.FloatingWindow {
@@ -27,9 +27,9 @@ package com.google.accompanist.navigation.material {
     method @Deprecated public androidx.compose.material.ModalBottomSheetValue getCurrentValue();
     method @Deprecated public androidx.compose.material.ModalBottomSheetValue getTargetValue();
     method @Deprecated public boolean isVisible();
-    property public final androidx.compose.material.ModalBottomSheetValue currentValue;
-    property public final boolean isVisible;
-    property public final androidx.compose.material.ModalBottomSheetValue targetValue;
+    property @Deprecated public final androidx.compose.material.ModalBottomSheetValue currentValue;
+    property @Deprecated public final boolean isVisible;
+    property @Deprecated public final androidx.compose.material.ModalBottomSheetValue targetValue;
   }
 
   @kotlin.RequiresOptIn(message="This APIs are experimental and may change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterialNavigationApi {
@@ -39,8 +39,5 @@ package com.google.accompanist.navigation.material {
     method @Deprecated @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public static void bottomSheet(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.ColumnScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
   }
 
-  public final class SheetContentHostKt {
-  }
-
 }
 
diff --git a/permissions/api/current.api b/permissions/api/current.api
index 9348beb05..29c4a3b02 100644
--- a/permissions/api/current.api
+++ b/permissions/api/current.api
@@ -20,12 +20,6 @@ package com.google.accompanist.permissions {
     method @androidx.compose.runtime.Composable @com.google.accompanist.permissions.ExperimentalPermissionsApi public static com.google.accompanist.permissions.MultiplePermissionsState rememberMultiplePermissionsState(java.util.List<java.lang.String> permissions, optional kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,java.lang.Boolean>,kotlin.Unit> onPermissionsResult);
   }
 
-  public final class MutableMultiplePermissionsStateKt {
-  }
-
-  public final class MutablePermissionStateKt {
-  }
-
   @androidx.compose.runtime.Stable @com.google.accompanist.permissions.ExperimentalPermissionsApi public interface PermissionState {
     method public String getPermission();
     method public com.google.accompanist.permissions.PermissionStatus getStatus();
diff --git a/systemuicontroller/api/current.api b/systemuicontroller/api/current.api
index 7cc3b3d29..56a381804 100644
--- a/systemuicontroller/api/current.api
+++ b/systemuicontroller/api/current.api
@@ -21,14 +21,14 @@ package com.google.accompanist.systemuicontroller {
     method @Deprecated public default void setSystemBarsColor(long color, optional boolean darkIcons, optional boolean isNavigationBarContrastEnforced, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color> transformColorForLightContent);
     method @Deprecated public default void setSystemBarsDarkContentEnabled(boolean);
     method @Deprecated public default void setSystemBarsVisible(boolean);
-    property public abstract boolean isNavigationBarContrastEnforced;
-    property public abstract boolean isNavigationBarVisible;
-    property public abstract boolean isStatusBarVisible;
-    property public default boolean isSystemBarsVisible;
-    property public abstract boolean navigationBarDarkContentEnabled;
-    property public abstract boolean statusBarDarkContentEnabled;
-    property public abstract int systemBarsBehavior;
-    property public default boolean systemBarsDarkContentEnabled;
+    property @Deprecated public abstract boolean isNavigationBarContrastEnforced;
+    property @Deprecated public abstract boolean isNavigationBarVisible;
+    property @Deprecated public abstract boolean isStatusBarVisible;
+    property @Deprecated public default boolean isSystemBarsVisible;
+    property @Deprecated public abstract boolean navigationBarDarkContentEnabled;
+    property @Deprecated public abstract boolean statusBarDarkContentEnabled;
+    property @Deprecated public abstract int systemBarsBehavior;
+    property @Deprecated public default boolean systemBarsDarkContentEnabled;
   }
 
   public final class SystemUiControllerKt {

From 6891537c7693fdb02ec71d9ab5b92665741ed78f Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 26 Nov 2024 17:10:58 +1100
Subject: [PATCH 5/7] Only apply lint to published libraries

---
 .gitignore                                    |  4 ++++
 .idea/deploymentTargetSelector.xml            |  3 +++
 .idea/runConfigurations.xml                   | 17 ++++++++++++++++
 adaptive/build.gradle.kts                     |  1 -
 ...AndroidLibraryPublishedConventionPlugin.kt |  3 +++
 drawablepainter/build.gradle.kts              |  1 -
 gradle/libs.versions.toml                     | 20 -------------------
 internal-testutils/build.gradle.kts           |  1 -
 .../src/main/AndroidManifest.xml              |  2 +-
 .../src/main/res/values/themes.xml            |  2 +-
 navigation-animation/build.gradle.kts         |  1 -
 navigation-material/build.gradle.kts          |  1 -
 permissions/build.gradle.kts                  |  1 -
 systemuicontroller/build.gradle.kts           |  1 -
 testharness/build.gradle.kts                  |  1 -
 15 files changed, 29 insertions(+), 30 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.gitignore b/.gitignore
index f985c2bff..fda63d638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ captures
 .idea/deploymentTargetDropDown.xml
 .idea/misc.xml
 .idea/androidTestResultsUserPreferences.xml
+.idea/deploymentTargetSelector.xml
 gradle.xml
 *.iml
 
@@ -42,3 +43,6 @@ package-list-coil-base
 docs-gen
 site
 *.bak
+
+# Lint reports
+lint-report.*
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 9f22ef434..38d5081d2 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -16,6 +16,9 @@
       <SelectionState runConfigName="All Tests">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="sample">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 000000000..16660f1d8
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/adaptive/build.gradle.kts b/adaptive/build.gradle.kts
index b518ff815..dea7f0f57 100644
--- a/adaptive/build.gradle.kts
+++ b/adaptive/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
index a9d1cbce3..706d0731b 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
@@ -1,6 +1,7 @@
 import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 
 /*
@@ -23,6 +24,8 @@ class AndroidLibraryPublishedConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
+                apply(AndroidLintConventionPlugin::class)
+
                 apply("me.tylerbwong.gradle.metalava")
                 apply("org.jetbrains.dokka")
                 apply("com.vanniktech.maven.publish")
diff --git a/drawablepainter/build.gradle.kts b/drawablepainter/build.gradle.kts
index 1896a72c3..ad11480c5 100644
--- a/drawablepainter/build.gradle.kts
+++ b/drawablepainter/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5fd11fdb8..aa5b07629 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 
 compose = "1.7.0"
-composeCompiler = "1.5.8"
 composeMaterial3 = "1.0.1"
 composesnapshot = "-" # a single character = no snapshot
 
@@ -15,7 +14,6 @@ lintMinCompose = "30.0.0"
 ktlint = "0.45.2"
 kotlin = "2.0.20"
 coroutines = "1.6.4"
-okhttp = "3.12.13"
 coil = "1.3.2"
 
 androidlint = "25.3.0"
@@ -42,14 +40,10 @@ compose-material3-material3 = { module = "androidx.compose.material3:material3",
 compose-animation-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
 compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 
-snapper = "dev.chrisbanes.snapper:snapper:0.2.2"
-
 android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
 gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "vanniktechPublish" }
 metalavaGradle = { module = "me.tylerbwong.gradle.metalava:plugin", version.ref = "metalava" }
 
-glide = "com.github.bumptech.glide:glide:4.12.0"
-
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -57,14 +51,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-metadataJvm = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0"
 
 kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
-kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-
-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 
-okhttp-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
-okhttp-mockWebServer = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
-
-coil-coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 
@@ -72,10 +59,8 @@ androidx-appcompat = "androidx.appcompat:appcompat:1.4.2"
 androidx-core = "androidx.core:core-ktx:1.8.0"
 androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"
 androidx-fragment = "androidx.fragment:fragment-ktx:1.8.1"
-androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03"
 androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
 androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
-androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common-java8:2.6.1"
 androidx-window = { module = "androidx.window:window", version.ref = "androidxWindow" }
 androidx-window-testing = { module = "androidx.window:window-testing", version.ref = "androidxWindow" }
 
@@ -90,9 +75,6 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxt
 androidx-test-orchestrator = "androidx.test:orchestrator:1.5.0"
 androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 
-androidx-test-espressoCore = "androidx.test.espresso:espresso-core:3.6.1"
-androidx-test-espressoWeb = "androidx.test.espresso:espresso-web:3.6.1"
-
 junit = "junit:junit:4.13.2"
 truth = "com.google.truth:truth:1.1.3"
 robolectric = "org.robolectric:robolectric:4.12.1"
@@ -105,8 +87,6 @@ android-tools-lint-lint = { module = "com.android.tools.lint:lint", version.ref
 android-tools-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lintMinCompose" }
 android-tools-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lintMinCompose" }
 
-squareup-mockwebserver = "com.squareup.okhttp3:mockwebserver:4.10.0"
-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "gradlePlugin" }
 android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/internal-testutils/build.gradle.kts b/internal-testutils/build.gradle.kts
index 7d1f4526b..af02046fc 100644
--- a/internal-testutils/build.gradle.kts
+++ b/internal-testutils/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/internal-testutils/src/main/AndroidManifest.xml b/internal-testutils/src/main/AndroidManifest.xml
index 8b83e4544..e6b340752 100644
--- a/internal-testutils/src/main/AndroidManifest.xml
+++ b/internal-testutils/src/main/AndroidManifest.xml
@@ -16,6 +16,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application android:theme="@style/Theme.Test" />
+    <application android:theme="@style/InternalTestutilsTheme.Test" />
 
 </manifest>
diff --git a/internal-testutils/src/main/res/values/themes.xml b/internal-testutils/src/main/res/values/themes.xml
index 0edb26d5c..09f922fe6 100644
--- a/internal-testutils/src/main/res/values/themes.xml
+++ b/internal-testutils/src/main/res/values/themes.xml
@@ -17,7 +17,7 @@
 
 <resources>
 
-    <style name="Theme.Test" parent="@android:style/Theme.Material.Light.NoActionBar">
+    <style name="InternalTestutilsTheme.Test" parent="@android:style/Theme.Material.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
diff --git a/navigation-animation/build.gradle.kts b/navigation-animation/build.gradle.kts
index f63e085ae..d312fc4f3 100644
--- a/navigation-animation/build.gradle.kts
+++ b/navigation-animation/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/navigation-material/build.gradle.kts b/navigation-material/build.gradle.kts
index f73727fc2..b24487f1e 100644
--- a/navigation-material/build.gradle.kts
+++ b/navigation-material/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index 4d34446e4..c891301cf 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/systemuicontroller/build.gradle.kts b/systemuicontroller/build.gradle.kts
index 252b8f877..1c0b4717d 100644
--- a/systemuicontroller/build.gradle.kts
+++ b/systemuicontroller/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/testharness/build.gradle.kts b/testharness/build.gradle.kts
index 1c0d45315..a2076502d 100644
--- a/testharness/build.gradle.kts
+++ b/testharness/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {

From 51cf60d6046abdab9d1db2d20ea09e9fe5fb3140 Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Mon, 9 Dec 2024 10:50:29 +1100
Subject: [PATCH 6/7] Fix ui tests

---
 .idea/deploymentTargetSelector.xml    | 20 +++++++++-----------
 navigation-animation/build.gradle.kts |  8 ++++++++
 navigation-material/build.gradle.kts  |  8 ++++++++
 permissions/build.gradle.kts          |  7 +++++++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 38d5081d2..87bd97165 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -2,23 +2,21 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="Tests in 'com.google.accompanist.permissions'">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-08-21T21:17:58.208137Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/bentrengrove/.android/avd/Pixel_8a_API_29.avd" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
       <SelectionState runConfigName="All Tests">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
       <SelectionState runConfigName="sample">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="Tests in 'com.google.accompanist.navigation.material'">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="MultipleAndSinglePermissionsTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="singlePermission_granted()">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/navigation-animation/build.gradle.kts b/navigation-animation/build.gradle.kts
index d312fc4f3..c562aef03 100644
--- a/navigation-animation/build.gradle.kts
+++ b/navigation-animation/build.gradle.kts
@@ -23,6 +23,14 @@ plugins {
 
 android {
     namespace = "com.google.accompanist.navigation.animation"
+
+    packaging {
+        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
+        // our test APK to build (has no effect on our AARs)
+        resources {
+            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
+        }
+    }
 }
 
 dependencies {
diff --git a/navigation-material/build.gradle.kts b/navigation-material/build.gradle.kts
index b24487f1e..f657d430a 100644
--- a/navigation-material/build.gradle.kts
+++ b/navigation-material/build.gradle.kts
@@ -23,6 +23,14 @@ plugins {
 
 android {
     namespace = "com.google.accompanist.navigation.material"
+
+    packaging {
+        // Some of the META-INF files conflict with coroutines-test. Exclude them to enable
+        // our test APK to build (has no effect on our AARs)
+        resources {
+            excludes += listOf("/META-INF/AL2.0", "/META-INF/LGPL2.1")
+        }
+    }
 }
 
 dependencies {
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index c891301cf..0c1a8ee2c 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -24,6 +24,13 @@ plugins {
 android {
     namespace = "com.google.accompanist.permissions"
 
+    defaultConfig {
+        // The following argument makes the Android Test Orchestrator run its
+        // "pm clear" command after each test invocation. This command ensures
+        // that the app's state is completely cleared between tests.
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
+    }
+
     testOptions {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }

From 0689837db8ebd8aa82f857f260a898ff335ac078 Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 10 Dec 2024 12:43:28 +1100
Subject: [PATCH 7/7] Fix up ununsed code and imports

---
 .../kotlin/AndroidLibraryConventionPlugin.kt  |  4 +---
 ...AndroidLibraryPublishedConventionPlugin.kt | 12 +++++------
 .../com/google/accompanist/AndroidCompose.kt  |  4 ----
 .../com/google/accompanist/KotlinAndroid.kt   | 21 -------------------
 build.gradle                                  |  4 ++--
 gradle/libs.versions.toml                     |  2 ++
 sample/build.gradle.kts                       |  6 +++++-
 7 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index aa84449e0..7f4a6c2ad 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -16,8 +16,6 @@
 
 import com.android.build.gradle.LibraryExtension
 import com.google.accompanist.configureKotlinAndroid
-import com.google.accompanist.libs
-import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -34,7 +32,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
                 buildFeatures.buildConfig = false
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
index 706d0731b..70a20393b 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
@@ -1,9 +1,3 @@
-import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.configure
-
 /*
  * Copyright 2024 The Android Open Source Project
  *
@@ -20,6 +14,12 @@ import org.gradle.kotlin.dsl.configure
  * limitations under the License.
  */
 
+import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+
 class AndroidLibraryPublishedConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
index d5307b08d..2be40c794 100644
--- a/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/accompanist/AndroidCompose.kt
@@ -20,7 +20,6 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
 
 /**
@@ -34,9 +33,6 @@ internal fun Project.configureAndroidCompose(
             compose = true
         }
 
-        dependencies {
-        }
-
         testOptions {
             unitTests {
                 // For Robolectric
diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt
index 787afad69..07cdfbcd3 100644
--- a/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/accompanist/KotlinAndroid.kt
@@ -49,23 +49,6 @@ internal fun Project.configureKotlinAndroid(
     }
 
     configureKotlin<KotlinAndroidProjectExtension>()
-
-    dependencies {
-    }
-}
-
-/**
- * Configure base Kotlin options for JVM (non-Android)
- */
-internal fun Project.configureKotlinJvm() {
-    extensions.configure<JavaPluginExtension> {
-        // Up to Java 11 APIs are available through desugaring
-        // https://developer.android.com/studio/write/java11-minimal-support-table
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
-    configureKotlin<KotlinJvmProjectExtension>()
 }
 
 /**
@@ -82,10 +65,6 @@ private inline fun <reified T : KotlinTopLevelExtension> Project.configureKotlin
     }.apply {
         jvmTarget = JvmTarget.JVM_1_8
         allWarningsAsErrors = warningsAsErrors.toBoolean()
-        freeCompilerArgs.add(
-            // Enable experimental coroutines APIs, including Flow
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-        )
         explicitApi()
     }
 }
diff --git a/build.gradle b/build.gradle
index 55cfdb945..304132839 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
-
 /*
  * Copyright 2020 The Android Open Source Project
  *
@@ -16,6 +14,8 @@ import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
  * limitations under the License.
  */
 
+import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
+
 buildscript {
     repositories {
         google()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aa5b07629..08a4ada85 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ compose = "1.7.0"
 composeMaterial3 = "1.0.1"
 composesnapshot = "-" # a single character = no snapshot
 
+desugar_jdk_libs = "2.1.3"
 dokka = "1.8.10"
 
 # gradlePlugin and lint need to be updated together
@@ -41,6 +42,7 @@ compose-animation-animation = { module = "androidx.compose.animation:animation",
 compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 
 android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "vanniktechPublish" }
 metalavaGradle = { module = "me.tylerbwong.gradle.metalava:plugin", version.ref = "metalava" }
 
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 125def668..e0835e5d4 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -30,7 +30,7 @@ android {
     defaultConfig {
         applicationId = "com.google.accompanist.sample"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
 
         versionCode = 1
         versionName = "1.0"
@@ -41,6 +41,8 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+
+        isCoreLibraryDesugaringEnabled = true
     }
 
     buildFeatures {
@@ -61,6 +63,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+
     implementation(project(":adaptive"))
     implementation(project(":drawablepainter"))
     implementation(project(":navigation-animation"))