Skip to content

Commit a40ee65

Browse files
[fused lib][built-in-kotlin] Migrate recipe
Migrates applyFusedLibraryPlugin to support built-in-kotlin. Bug: 385745419 Test: Recipe tests Change-Id: I2009006856403d703dc6b43d5a9179e6df1fcdeb
1 parent c457cc2 commit a40ee65

File tree

6 files changed

+0
-19
lines changed

6 files changed

+0
-19
lines changed

recipes/applyFusedLibraryPlugin/androidLib1/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
alias(libs.plugins.android.library)
19-
alias(libs.plugins.jetbrains.kotlin.android)
2019
}
2120

2221
android {
@@ -48,9 +47,6 @@ android {
4847
sourceCompatibility = JavaVersion.VERSION_1_8
4948
targetCompatibility = JavaVersion.VERSION_1_8
5049
}
51-
kotlinOptions {
52-
jvmTarget = "1.8"
53-
}
5450
}
5551

5652
dependencies {

recipes/applyFusedLibraryPlugin/androidLib2/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
alias(libs.plugins.android.library)
19-
alias(libs.plugins.jetbrains.kotlin.android)
2019
`maven-publish`
2120
}
2221

@@ -34,9 +33,6 @@ android {
3433
sourceCompatibility = JavaVersion.VERSION_1_8
3534
targetCompatibility = JavaVersion.VERSION_1_8
3635
}
37-
kotlinOptions {
38-
jvmTarget = "1.8"
39-
}
4036
}
4137

4238
dependencies {

recipes/applyFusedLibraryPlugin/androidLib3/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
alias(libs.plugins.android.library)
19-
alias(libs.plugins.jetbrains.kotlin.android)
2019
`maven-publish`
2120
}
2221

@@ -44,9 +43,6 @@ android {
4443
sourceCompatibility = JavaVersion.VERSION_1_8
4544
targetCompatibility = JavaVersion.VERSION_1_8
4645
}
47-
kotlinOptions {
48-
jvmTarget = "1.8"
49-
}
5046
}
5147

5248
publishing {

recipes/applyFusedLibraryPlugin/app/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
alias(libs.plugins.android.application)
19-
alias(libs.plugins.jetbrains.kotlin.android)
2019
}
2120

2221
android {
@@ -46,9 +45,6 @@ android {
4645
sourceCompatibility = JavaVersion.VERSION_17
4746
targetCompatibility = JavaVersion.VERSION_17
4847
}
49-
kotlinOptions {
50-
jvmTarget = "17"
51-
}
5248
}
5349

5450
dependencies {

recipes/applyFusedLibraryPlugin/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
plugins {
1919
alias(libs.plugins.android.application) apply false
20-
alias(libs.plugins.jetbrains.kotlin.android) apply false
2120
alias(libs.plugins.android.library) apply false
2221
alias(libs.plugins.android.fusedlibrary) apply false
2322
}

recipes/applyFusedLibraryPlugin/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ android.experimental.fusedLibrarySupport=true
3232
# experience issues syncing or with dependency resolution.
3333
android.experimental.fusedLibrarySupport.publicationOnly=false
3434

35-
# TODO(b/385745419): Migrate to built-in Kotlin
36-
android.builtInKotlin=false
3735
# TODO(b/417183956) Migrate to new variant API
3836
android.enableLegacyVariantApi=true
3937
# TODO(b/418804641): Migrate to new DSL

0 commit comments

Comments
 (0)