Skip to content

Commit 4a6828b

Browse files
committed
Upgrade kotlin metadata and match lint to androidx
1 parent d2d3fc1 commit 4a6828b

File tree

7 files changed

+393
-224
lines changed

7 files changed

+393
-224
lines changed

build-logic/convention/src/main/kotlin/com/google/accompanist/BundleInsideHelper.kt

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ import org.gradle.api.tasks.TaskProvider
3232
import org.gradle.kotlin.dsl.named
3333
import org.gradle.kotlin.dsl.register
3434

35+
/**
36+
* Originally from https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:buildSrc/public/src/main/kotlin/androidx/build/BundleInsideHelper.kt
37+
* Small modifications based on gradle version
38+
*/
39+
3540
/** Allow java and Android libraries to bundle other projects inside the project jar/aar. */
3641
object BundleInsideHelper {
3742
val CONFIGURATION_NAME = "bundleInside"

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "
5252
kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
5353
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
5454
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
55-
kotlin-metadataJvm = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0"
55+
kotlin-metadataJvm = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }
5656

5757
kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
5858

permissions-lint/build.gradle.kts

-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ plugins {
2323
id(libs.plugins.android.lint.get().pluginId)
2424
}
2525

26-
kotlin {
27-
explicitApi()
28-
}
29-
3026
lint {
3127
htmlReport = true
3228
htmlOutput = file("lint-report.html")

0 commit comments

Comments
 (0)