Skip to content

Commit 151d09d

Browse files
build: Remove kotlin-android plugin and kotlinOptions for AGP 9.0
1 parent b3356a4 commit 151d09d

File tree

15 files changed

+0
-39
lines changed

15 files changed

+0
-39
lines changed

AccessibilityCodelab/app/build.gradle

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

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
2019
id 'org.jetbrains.kotlin.plugin.compose'
2120
}
2221

AdaptiveUiCodelab/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.kotlin.android)
2019
alias(libs.plugins.compose.compiler)
2120
}
2221

@@ -50,9 +49,6 @@ android {
5049
sourceCompatibility = JavaVersion.VERSION_1_8
5150
targetCompatibility = JavaVersion.VERSION_1_8
5251
}
53-
kotlinOptions {
54-
jvmTarget = "1.8"
55-
}
5652
buildFeatures {
5753
compose = true
5854
}

AdvancedStateAndSideEffectsCodelab/app/build.gradle

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

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
2019
id 'kotlin-kapt'
2120
id 'dagger.hilt.android.plugin'
2221
id 'org.jetbrains.kotlin.plugin.compose'
@@ -69,10 +68,6 @@ android {
6968
targetCompatibility JavaVersion.VERSION_1_8
7069
}
7170

72-
kotlinOptions {
73-
jvmTarget = "1.8"
74-
}
75-
7671
buildFeatures {
7772
compose true
7873

AnimationCodelab/finished/build.gradle

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

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
2019
id 'org.jetbrains.kotlin.plugin.compose'
2120
}
2221

@@ -37,9 +36,6 @@ android {
3736
buildFeatures {
3837
compose true
3938
}
40-
kotlinOptions {
41-
jvmTarget = '1.8'
42-
}
4339
}
4440

4541
dependencies {

AnimationCodelab/start/build.gradle

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

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
2019
id 'org.jetbrains.kotlin.plugin.compose'
2120
}
2221

@@ -37,9 +36,6 @@ android {
3736
buildFeatures {
3837
compose true
3938
}
40-
kotlinOptions {
41-
jvmTarget = '1.8'
42-
}
4339
}
4440

4541
dependencies {

BasicLayoutsCodelab/app/build.gradle

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

1717
plugins {
1818
id 'com.android.application'
19-
id 'org.jetbrains.kotlin.android'
2019
id 'org.jetbrains.kotlin.plugin.compose'
2120
}
2221

@@ -47,9 +46,6 @@ android {
4746
sourceCompatibility JavaVersion.VERSION_1_8
4847
targetCompatibility JavaVersion.VERSION_1_8
4948
}
50-
kotlinOptions {
51-
jvmTarget = '1.8'
52-
}
5349
buildFeatures {
5450
compose true
5551
}

BasicStateCodelab/app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1919

2020
plugins {
2121
id("com.android.application")
22-
id("org.jetbrains.kotlin.android")
2322
id("org.jetbrains.kotlin.plugin.compose")
2423
}
2524

BasicsCodelab/app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1919

2020
plugins {
2121
id("com.android.application")
22-
id("org.jetbrains.kotlin.android")
2322
id("org.jetbrains.kotlin.plugin.compose")
2423
}
2524

MigrationCodelab/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
apply plugin: 'com.android.application'
18-
apply plugin: 'kotlin-android'
1918
apply plugin: 'kotlin-kapt'
2019
apply plugin: 'androidx.navigation.safeargs.kotlin'
2120
apply plugin: 'org.jetbrains.kotlin.plugin.compose'

NavigationCodelab/app/build.gradle

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

1717
plugins {
1818
id 'com.android.application'
19-
id 'kotlin-android'
2019
id 'org.jetbrains.kotlin.plugin.compose'
2120
}
2221

@@ -61,10 +60,6 @@ android {
6160
targetCompatibility JavaVersion.VERSION_1_8
6261
}
6362

64-
kotlinOptions {
65-
jvmTarget = '1.8'
66-
}
67-
6863
buildFeatures {
6964
compose true
7065
}

0 commit comments

Comments
 (0)