Upgrade kotlin metadata and match lint to androidx

google · Dec 10, 2024 · 4a6828b · 4a6828b
1 parent d2d3fc1
commit 4a6828b
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 224 deletions.
diff --git a/build-logic/convention/src/main/kotlin/com/google/accompanist/BundleInsideHelper.kt b/build-logic/convention/src/main/kotlin/com/google/accompanist/BundleInsideHelper.kt
@@ -32,6 +32,11 @@ import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.register
 
+/**
+ * Originally from https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:buildSrc/public/src/main/kotlin/androidx/build/BundleInsideHelper.kt
+ * Small modifications based on gradle version
+ */
+
 /** Allow java and Android libraries to bundle other projects inside the project jar/aar. */
 object BundleInsideHelper {
     val CONFIGURATION_NAME = "bundleInside"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -52,7 +52,7 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "
 kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-kotlin-metadataJvm = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0"
+kotlin-metadataJvm = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }
 
 kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 

diff --git a/permissions-lint/build.gradle.kts b/permissions-lint/build.gradle.kts
@@ -23,10 +23,6 @@ plugins {
     id(libs.plugins.android.lint.get().pluginId)
 }
 
-kotlin {
-    explicitApi()
-}
-
 lint {
     htmlReport = true
     htmlOutput = file("lint-report.html")