Fix up ununsed code and imports

Author: bentrengrove

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

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) {

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

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()
     }
 }

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()

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" }
 

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"))