Skip to content

Manual fake-merge of buildSrc and build.gradle files from 8e7a464b4f884c7d79627b0b5475d86ae07b52a6 #3042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Oleksandr Karpovich (eymar) merged 1 commit into from
May 12, 2026
Merged

Manual fake-merge of buildSrc and build.gradle files from 8e7a464b4f884c7d79627b0b5475d86ae07b52a6 #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions activity/activity-compose/benchmark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ plugins {
id("AndroidXPlugin")
id("com.android.library")
id("AndroidXComposePlugin")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("androidx.benchmark")
}

Expand All @@ -25,7 +23,7 @@ dependencies {
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.activity.compose.benchmark"

// DO NOT CHECK IN! Enable experimental benchmarking with R8 - for local runs only
Expand Down
6 changes: 3 additions & 3 deletions activity/activity-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ plugins {
id("AndroidXPlugin")
id("com.android.library")
id("AndroidXComposePlugin")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand Down Expand Up @@ -80,6 +78,8 @@ androidx {
}

android {
compileSdk = 36
compileSdk {
version = release(37)
}
namespace = "androidx.activity.compose"
}
6 changes: 3 additions & 3 deletions activity/activity-compose/samples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ plugins {
id("AndroidXPlugin")
id("com.android.library")
id("AndroidXComposePlugin")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand Down Expand Up @@ -60,6 +58,8 @@ androidx {
}

android {
compileSdk = 36
compileSdk {
version = release(37)
}
namespace = "androidx.activity.compose.samples"
}
4 changes: 1 addition & 3 deletions activity/activity-ktx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand All @@ -49,6 +47,6 @@ androidx {
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.activity.ktx"
}
4 changes: 1 addition & 3 deletions activity/activity/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ import androidx.build.SoftwareType
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("androidx.baselineprofile")
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.activity"
}

Expand Down
2 changes: 0 additions & 2 deletions activity/integration-tests/baselineprofile/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice
plugins {
id("AndroidXPlugin")
id("com.android.test")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("androidx.baselineprofile")
}

Expand Down
4 changes: 1 addition & 3 deletions activity/integration-tests/macrobenchmark-target/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
plugins {
id("AndroidXPlugin")
id("com.android.application")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.activity.integration.macrobenchmark.target"
}

Expand Down
2 changes: 0 additions & 2 deletions activity/integration-tests/macrobenchmark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
plugins {
id("AndroidXPlugin")
id("com.android.test")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

android {
Expand Down
6 changes: 3 additions & 3 deletions activity/integration-tests/testapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
plugins {
id("AndroidXPlugin")
id("com.android.application")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("androidx.baselineprofile")
}

android {
compileSdk = 36
compileSdk {
version = release(37)
}
defaultConfig {
applicationId = "androidx.activity.integration.testapp"
}
Expand Down
2 changes: 0 additions & 2 deletions annotation/annotation-experimental-lint/integration-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ def isIdeBuild() {
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

android {
Expand Down
2 changes: 0 additions & 2 deletions annotation/annotation-experimental/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import androidx.build.SoftwareType
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand Down
2 changes: 0 additions & 2 deletions annotation/annotation-keep/samples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import androidx.build.SoftwareType
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

android {
Expand Down
2 changes: 0 additions & 2 deletions appcompat/appcompat-benchmark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import androidx.build.SoftwareType
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("androidx.benchmark")
}

Expand Down
4 changes: 1 addition & 3 deletions appcompat/appcompat-lint/integration-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
plugins {
id("AndroidXPlugin")
id("com.android.application")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand All @@ -18,7 +16,7 @@ dependencies {
}

android {
compileSdk = 35
compileSdk { version = release(35) }
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
Expand Down
2 changes: 0 additions & 2 deletions appcompat/appcompat-resources/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import androidx.build.SoftwareType
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion appcompat/appcompat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ plugins {
id("AndroidXPlugin")
id("com.android.library")
id("com.android.legacy-kapt")
id("com.android.experimental.built-in-kotlin")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion appcompat/integration-tests/receive-content-testapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
}

android {
compileSdk = 35
compileSdk { version = release(35) }
namespace = "androidx.appcompat.demo.receivecontent"
}

Expand Down
4 changes: 1 addition & 3 deletions appfunctions/appfunctions-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import androidx.build.SoftwareType
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand Down Expand Up @@ -67,7 +65,7 @@ dependencies {
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.appfunctions.service"
}

Expand Down
2 changes: 1 addition & 1 deletion appfunctions/appfunctions-stubs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
}

android {
compileSdk = 36
compileSdk { version = release(36) }
namespace = "com.android.extensions.appfunctions"
}

Expand Down
4 changes: 1 addition & 3 deletions appfunctions/appfunctions-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp")
}

Expand Down Expand Up @@ -57,7 +55,7 @@ ksp {
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.appfunctions.testing"
}

Expand Down
4 changes: 1 addition & 3 deletions appfunctions/appfunctions/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ plugins {
id("AndroidXPlugin")
id("com.android.library")
id("com.android.legacy-kapt")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand Down Expand Up @@ -79,7 +77,7 @@ kapt {
}

android {
compileSdk = 36
compileSdk { version = release(37) }
namespace = "androidx.appfunctions"
}

Expand Down
4 changes: 2 additions & 2 deletions appfunctions/integration-tests/agentapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ def prepareTargetApkTaskProvider = tasks.register("prepareTargetApk", PrepareTar

android {
namespace = "androidx.appfunctions.integration.test.agent"
compileSdk = 36
compileSdk { version = release(37) }
defaultConfig {
minSdk = 33
minSdk { version = release(33) }

testInstrumentationRunnerArgument("TARGET_APP_APK", targetAppApkName)
}
Expand Down
6 changes: 2 additions & 4 deletions appfunctions/integration-tests/multi-modules-testapp/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ import com.android.build.api.artifact.SingleArtifact
plugins {
id("AndroidXPlugin")
id("com.android.application")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp")
}

android {
namespace = "androidx.appfunctions.integration.testapp"
compileSdk = 36
compileSdk { version = release(37) }
defaultConfig {
minSdk = 33
minSdk { version = release(33) }
}
// Prevent assets file from being compressed. This is for Uri access test.
aaptOptions {
Expand Down
6 changes: 2 additions & 4 deletions appfunctions/integration-tests/multi-modules-testapp/shared-library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@
plugins {
id("AndroidXPlugin")
id("com.android.library")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp")
}

android {
namespace = "androidx.appfunctions.integration.testapp.shared_library"
compileSdk = 36
compileSdk { version = release(37) }

defaultConfig {
minSdk = 33
minSdk { version = release(33) }
}
}

Expand Down
4 changes: 2 additions & 2 deletions appfunctions/integration-tests/shared-schema/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ plugins {

android {
namespace = "androidx.appfunction.integration.test.sharedschema"
compileSdk = 36
compileSdk { version = release(37) }

defaultConfig {
minSdk = 33
minSdk { version = release(33) }
}
}

Expand Down
2 changes: 1 addition & 1 deletion appsearch/appsearch-builtin-types/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ androidx {
}

android {
compileSdk = 36
compileSdk { version = release(36) }
namespace = "androidx.appsearch.builtintypes"
}
2 changes: 1 addition & 1 deletion appsearch/appsearch-debug-view/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ plugins {
}

android {
compileSdk = 36
compileSdk { version = release(36) }
namespace = "androidx.appsearch.debugview"
}

Expand Down
2 changes: 1 addition & 1 deletion appsearch/appsearch-debug-view/samples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ plugins {
}

android {
compileSdk = 36
compileSdk { version = release(36) }
namespace = "androidx.appsearch.debugview.samples"
}

Expand Down
4 changes: 1 addition & 3 deletions appsearch/appsearch-ktx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ plugins {
id("AndroidXPlugin")
id("com.android.library")
id("com.android.legacy-kapt")
//id("com.android.experimental.built-in-kotlin")
id("org.jetbrains.kotlin.android")
}

dependencies {
Expand All @@ -50,6 +48,6 @@ androidx {
}

android {
compileSdk = 36
compileSdk { version = release(36) }
namespace = "androidx.appsearch.ktx"
}
6 changes: 1 addition & 5 deletions appsearch/appsearch-local-storage/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ plugins {
}

android {
compileSdk = 36
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
compileSdk { version = release(36) }
buildTypes.configureEach {
// TODO(b/161836669): Minifiation is currently disabled because if it is on, the aar gets
// desugared twice in some workflows, which fails. Decide how to handle this (e.g.
Expand Down
Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.