update tools and kotlin compiler

MagicalMeghan · MagicalMeghan · commit bb061c27ed94 · 2024-01-10T17:32:30.000-05:00
diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
@@ -80,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
     packagingOptions {
         resources {
diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -84,7 +84,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.50"
     }
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle
@@ -40,7 +40,7 @@ android {
         jvmTarget = '1.8'
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 }
 
diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle
@@ -40,7 +40,7 @@ android {
         jvmTarget = '1.8'
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 }
 
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
@@ -53,7 +53,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
     packagingOptions {
         resources {
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts
@@ -56,7 +56,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts
@@ -56,7 +56,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
@@ -16,6 +16,6 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.1" apply false
+    id("com.android.application") version "8.1.4" apply false
     id("org.jetbrains.kotlin.android") version "1.9.21" apply false
 }
diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
@@ -50,7 +50,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.6"
     }
diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
@@ -69,7 +69,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
@@ -76,7 +76,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
@@ -80,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 
     packagingOptions {
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle
@@ -41,7 +41,7 @@ android {
          compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.8'
+        kotlinCompilerExtensionVersion '1.5.7'
     }
 }
 
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.2.1"
+        classpath "com.android.tools.build:gradle:8.1.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ android {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`composeOptions {`
`83`		`- kotlinCompilerExtensionVersion '1.5.8'`
	`83`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ buildscript {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`dependencies {`
`24`		`- classpath 'com.android.tools.build:gradle:8.2.1'`
	`24`	`+ classpath 'com.android.tools.build:gradle:8.1.4'`
`25`	`25`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ android {`
`53`	`53`	`compose true`
`54`	`54`	`}`
`55`	`55`	`composeOptions {`
`56`		`- kotlinCompilerExtensionVersion '1.5.8'`
	`56`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`57`	`57`	`}`
`58`	`58`	`packagingOptions {`
`59`	`59`	`resources {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ buildscript {`
`19`	`19`	`mavenCentral()`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`		`- classpath "com.android.tools.build:gradle:8.2.1"`
	`22`	`+ classpath "com.android.tools.build:gradle:8.1.4"`
`23`	`23`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ android {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`composeOptions {`
`87`		`- kotlinCompilerExtensionVersion '1.5.8'`
	`87`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`packagingOptions {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ buildscript {`
`20`	`20`	`mavenCentral()`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`		`- classpath "com.android.tools.build:gradle:8.2.1"`
	`23`	`+ classpath "com.android.tools.build:gradle:8.1.4"`
`24`	`24`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"`
`25`	`25`	`classpath "com.google.dagger:hilt-android-gradle-plugin:2.50"`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ android {`
`40`	`40`	`jvmTarget = '1.8'`
`41`	`41`	`}`
`42`	`42`	`composeOptions {`
`43`		`- kotlinCompilerExtensionVersion '1.5.8'`
	`43`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ android {`
`56`	`56`	`compose = true`
`57`	`57`	`}`
`58`	`58`	`composeOptions {`
`59`		`- kotlinCompilerExtensionVersion = "1.5.8"`
	`59`	`+ kotlinCompilerExtensionVersion = "1.5.7"`
`60`	`60`	`}`
`61`	`61`	`packaging {`
`62`	`62`	`resources {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`
`17`	`17`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`18`	`18`	`plugins {`
`19`		`- id("com.android.application") version "8.2.1" apply false`
	`19`	`+ id("com.android.application") version "8.1.4" apply false`
`20`	`20`	`id("org.jetbrains.kotlin.android") version "1.9.21" apply false`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ android {`
`50`	`50`	`compose true`
`51`	`51`	`}`
`52`	`52`	`composeOptions {`
`53`		`- kotlinCompilerExtensionVersion '1.5.8'`
	`53`	`+ kotlinCompilerExtensionVersion '1.5.7'`
`54`	`54`	`}`
`55`	`55`	`packagingOptions {`
`56`	`56`	`// Multiple dependency bring these files in. Exclude them to enable`