diff --git a/kotlin/advanced/JetpackComposeDemo/app/build.gradle.kts b/kotlin/advanced/JetpackComposeDemo/app/build.gradle.kts index 0fd2ac8e4..84a2eabd5 100644 --- a/kotlin/advanced/JetpackComposeDemo/app/build.gradle.kts +++ b/kotlin/advanced/JetpackComposeDemo/app/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { implementation("androidx.compose.foundation:foundation") implementation("androidx.navigation:navigation-compose:2.7.7") implementation("androidx.navigation:navigation-runtime-ktx:2.7.7") - implementation("com.google.android.gms:play-services-ads:23.4.0") + implementation("com.google.android.gms:play-services-ads:23.3.0") implementation("com.google.android.ump:user-messaging-platform:3.0.0") implementation(project(":compose-util")) debugImplementation("androidx.compose.ui:ui-tooling") diff --git a/kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/NativeScreen.kt b/kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/NativeScreen.kt index 17fd8f26b..1ae50740f 100644 --- a/kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/NativeScreen.kt +++ b/kotlin/advanced/JetpackComposeDemo/app/src/main/java/com/google/android/gms/example/jetpackcomposedemo/formats/NativeScreen.kt @@ -82,7 +82,7 @@ fun NativeScreen() { } // Native ad composable. - SampleNativeTemplate(nativeAdState) + SampleNativeTemplate(nativeAdState()) } @Composable diff --git a/kotlin/advanced/JetpackComposeDemo/build.gradle.kts b/kotlin/advanced/JetpackComposeDemo/build.gradle.kts index c151ad9f1..aeaeea9a2 100644 --- a/kotlin/advanced/JetpackComposeDemo/build.gradle.kts +++ b/kotlin/advanced/JetpackComposeDemo/build.gradle.kts @@ -1,17 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.6.0" apply false + id("com.android.application") version "8.3.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false - id("com.android.library") version "8.6.0" apply false + id("com.android.library") version "8.3.0" apply false } - -compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 -} - -kotlinOptions { - kotlinOptions.jvmTarget = "1.8" -} - -tasks.register("clean", Delete::class) { delete(rootProject.buildDir) } diff --git a/kotlin/advanced/JetpackComposeDemo/compose-util/build.gradle.kts b/kotlin/advanced/JetpackComposeDemo/compose-util/build.gradle.kts index f8bfb01f3..e30748a5c 100644 --- a/kotlin/advanced/JetpackComposeDemo/compose-util/build.gradle.kts +++ b/kotlin/advanced/JetpackComposeDemo/compose-util/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { implementation("androidx.compose.ui:ui-graphics:1.7.3") implementation("androidx.compose.material3:material3") implementation("androidx.compose.foundation:foundation") - implementation("com.google.android.gms:play-services-ads:23.4.0") + implementation("com.google.android.gms:play-services-ads:23.3.0") implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.4") debugImplementation("androidx.compose.ui:ui-tooling") } diff --git a/kotlin/advanced/JetpackComposeDemo/gradle/wrapper/gradle-wrapper.properties b/kotlin/advanced/JetpackComposeDemo/gradle/wrapper/gradle-wrapper.properties index dbe504853..7c90afec6 100644 --- a/kotlin/advanced/JetpackComposeDemo/gradle/wrapper/gradle-wrapper.properties +++ b/kotlin/advanced/JetpackComposeDemo/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 03 14:18:00 PDT 2024 +#Wed Oct 23 13:18:45 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-8.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists