-
Notifications
You must be signed in to change notification settings - Fork 606
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1802 from google/ben/buildlogic
Upgrade to Kotlin 2.0.20 and move to build-logic for Gradle
- Loading branch information
Showing
41 changed files
with
594 additions
and
553 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * 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) | ||
| compileOnly(libs.metalavaGradle) | ||
| 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" | ||
| } | ||
| register("androidLibraryPublished") { | ||
| id = "accompanist.android.library.published" | ||
| implementationClass = "AndroidLibraryPublishedConventionPlugin" | ||
| } | ||
| } | ||
| } | ||
|
|
35 changes: 35 additions & 0 deletions
35
build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| } | ||
| } | ||
|
|
||
| } |
52 changes: 52 additions & 0 deletions
52
build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * 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 = 35 | ||
| 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")) | ||
| } | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * 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 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) { | ||
| with(pluginManager) { | ||
| apply(AndroidLintConventionPlugin::class) | ||
|
|
||
| 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) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.