Skip to content

Commit a20022f

Browse files
eymareymar
committed
Manual fake-merge of buildSrc and build.gradle files from 8e7a464
Change-Id: I78f8f0eaa92755b7b34166c286fb7ea48c887b07
2 parents 9f0c9ae + 8e7a464 commit a20022f

659 files changed

Lines changed: 1016 additions & 1783 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎activity/activity-compose/benchmark/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ plugins {
55
id("AndroidXPlugin")
66
id("com.android.library")
77
id("AndroidXComposePlugin")
8-
//id("com.android.experimental.built-in-kotlin")
9-
id("org.jetbrains.kotlin.android")
108
id("androidx.benchmark")
119
}
1210

@@ -25,7 +23,7 @@ dependencies {
2523
}
2624

2725
android {
28-
compileSdk = 36
26+
compileSdk { version = release(37) }
2927
namespace = "androidx.activity.compose.benchmark"
3028

3129
// DO NOT CHECK IN! Enable experimental benchmarking with R8 - for local runs only

‎activity/activity-compose/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ plugins {
2626
id("AndroidXPlugin")
2727
id("com.android.library")
2828
id("AndroidXComposePlugin")
29-
//id("com.android.experimental.built-in-kotlin")
30-
id("org.jetbrains.kotlin.android")
3129
}
3230

3331
dependencies {
@@ -80,6 +78,8 @@ androidx {
8078
}
8179

8280
android {
83-
compileSdk = 36
81+
compileSdk {
82+
version = release(37)
83+
}
8484
namespace = "androidx.activity.compose"
8585
}

‎activity/activity-compose/samples/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ plugins {
2626
id("AndroidXPlugin")
2727
id("com.android.library")
2828
id("AndroidXComposePlugin")
29-
//id("com.android.experimental.built-in-kotlin")
30-
id("org.jetbrains.kotlin.android")
3129
}
3230

3331
dependencies {
@@ -60,6 +58,8 @@ androidx {
6058
}
6159

6260
android {
63-
compileSdk = 36
61+
compileSdk {
62+
version = release(37)
63+
}
6464
namespace = "androidx.activity.compose.samples"
6565
}

‎activity/activity-ktx/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2626
plugins {
2727
id("AndroidXPlugin")
2828
id("com.android.library")
29-
//id("com.android.experimental.built-in-kotlin")
30-
id("org.jetbrains.kotlin.android")
3129
}
3230

3331
dependencies {
@@ -49,6 +47,6 @@ androidx {
4947
}
5048

5149
android {
52-
compileSdk = 36
50+
compileSdk { version = release(37) }
5351
namespace = "androidx.activity.ktx"
5452
}

‎activity/activity/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ import androidx.build.SoftwareType
99
plugins {
1010
id("AndroidXPlugin")
1111
id("com.android.library")
12-
//id("com.android.experimental.built-in-kotlin")
13-
id("org.jetbrains.kotlin.android")
1412
id("androidx.baselineprofile")
1513
}
1614

1715
android {
18-
compileSdk = 36
16+
compileSdk { version = release(37) }
1917
namespace = "androidx.activity"
2018
}
2119

‎activity/integration-tests/baselineprofile/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice
2525
plugins {
2626
id("AndroidXPlugin")
2727
id("com.android.test")
28-
//id("com.android.experimental.built-in-kotlin")
29-
id("org.jetbrains.kotlin.android")
3028
id("androidx.baselineprofile")
3129
}
3230

‎activity/integration-tests/macrobenchmark-target/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
plugins {
88
id("AndroidXPlugin")
99
id("com.android.application")
10-
//id("com.android.experimental.built-in-kotlin")
11-
id("org.jetbrains.kotlin.android")
1210
}
1311

1412
android {
15-
compileSdk = 36
13+
compileSdk { version = release(37) }
1614
namespace = "androidx.activity.integration.macrobenchmark.target"
1715
}
1816

‎activity/integration-tests/macrobenchmark/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
plugins {
1818
id("AndroidXPlugin")
1919
id("com.android.test")
20-
//id("com.android.experimental.built-in-kotlin")
21-
id("org.jetbrains.kotlin.android")
2220
}
2321

2422
android {

‎activity/integration-tests/testapp/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
plugins {
1818
id("AndroidXPlugin")
1919
id("com.android.application")
20-
//id("com.android.experimental.built-in-kotlin")
21-
id("org.jetbrains.kotlin.android")
2220
id("androidx.baselineprofile")
2321
}
2422

2523
android {
26-
compileSdk = 36
24+
compileSdk {
25+
version = release(37)
26+
}
2727
defaultConfig {
2828
applicationId = "androidx.activity.integration.testapp"
2929
}

‎annotation/annotation-experimental-lint/integration-tests/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ def isIdeBuild() {
3030
plugins {
3131
id("AndroidXPlugin")
3232
id("com.android.library")
33-
//id("com.android.experimental.built-in-kotlin")
34-
id("org.jetbrains.kotlin.android")
3533
}
3634

3735
android {

0 commit comments

Comments
 (0)