diff --git a/.github/workflows/AccessibilityCodelab.yaml b/.github/workflows/AccessibilityCodelab.yaml index be4a33bba..b76b4ceb2 100644 --- a/.github/workflows/AccessibilityCodelab.yaml +++ b/.github/workflows/AccessibilityCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml index 599a14d68..40c2d194e 100644 --- a/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml +++ b/.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -70,7 +70,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/AnimationCodelab.yaml b/.github/workflows/AnimationCodelab.yaml index 5283ef33f..ad714ab10 100644 --- a/.github/workflows/AnimationCodelab.yaml +++ b/.github/workflows/AnimationCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/BasicLayoutsCodelab.yaml b/.github/workflows/BasicLayoutsCodelab.yaml index 36a6e32d2..8fe0c9cf6 100644 --- a/.github/workflows/BasicLayoutsCodelab.yaml +++ b/.github/workflows/BasicLayoutsCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/BasicStateCodelab.yaml b/.github/workflows/BasicStateCodelab.yaml index 684139ef9..df3c4d8bc 100644 --- a/.github/workflows/BasicStateCodelab.yaml +++ b/.github/workflows/BasicStateCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/BasicsCodelab.yaml b/.github/workflows/BasicsCodelab.yaml index f83daa3c3..1893e3a72 100644 --- a/.github/workflows/BasicsCodelab.yaml +++ b/.github/workflows/BasicsCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/MigrationCodelab.yaml b/.github/workflows/MigrationCodelab.yaml index e413b38f5..cf48d14eb 100644 --- a/.github/workflows/MigrationCodelab.yaml +++ b/.github/workflows/MigrationCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -70,7 +70,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/NavigationCodelab.yaml b/.github/workflows/NavigationCodelab.yaml index 6a87046a7..95b10cdbd 100644 --- a/.github/workflows/NavigationCodelab.yaml +++ b/.github/workflows/NavigationCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/TestingCodelab.yaml b/.github/workflows/TestingCodelab.yaml index e8fa813b5..01dfd4eff 100644 --- a/.github/workflows/TestingCodelab.yaml +++ b/.github/workflows/TestingCodelab.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/ThemingCodelab.yaml b/.github/workflows/ThemingCodelab.yaml index cead80ddd..57fba00b6 100644 --- a/.github/workflows/ThemingCodelab.yaml +++ b/.github/workflows/ThemingCodelab.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 5b5d1e679..b467e7681 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -63,7 +63,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { @@ -73,7 +73,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -93,9 +93,8 @@ dependencies { androidTestImplementation "androidx.compose.ui:ui-test" androidTestImplementation "androidx.compose.ui:ui-test-junit4" - def accompanist_version = '0.30.1' + def accompanist_version = '0.32.0' implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version" - implementation "com.google.accompanist:accompanist-insets:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" implementation "com.google.android.material:material:1.9.0" @@ -104,15 +103,15 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.activity:activity-ktx:1.7.2' - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.activity:activity-compose:1.7.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" - implementation 'androidx.navigation:navigation-compose:2.6.0' + implementation 'androidx.navigation:navigation-compose:2.7.3' androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'androidx.test:runner:1.5.2' diff --git a/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt b/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt index 2d7b94f3c..5fc2ce781 100644 --- a/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt +++ b/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt @@ -53,8 +53,6 @@ import com.example.jetnews.data.posts.PostsRepository import com.example.jetnews.model.Post import com.example.jetnews.ui.components.InsetAwareTopAppBar import com.example.jetnews.ui.theme.JetnewsTheme -import com.google.accompanist.insets.LocalWindowInsets -import com.google.accompanist.insets.rememberInsetsPaddingValues import kotlinx.coroutines.launch /** diff --git a/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt b/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt index 9a511adae..1506eb260 100644 --- a/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt +++ b/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt @@ -57,7 +57,6 @@ import com.example.jetnews.data.interests.TopicSelection import com.example.jetnews.data.interests.TopicsMap import com.example.jetnews.ui.components.InsetAwareTopAppBar import com.example.jetnews.ui.theme.JetnewsTheme -import com.google.accompanist.insets.navigationBarsPadding import kotlinx.coroutines.launch /** diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index cc177c3d7..69d7fa39e 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" } } plugins { - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } subprojects { diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle index 523d2e849..4d9a33aa4 100644 --- a/AdaptiveUiCodelab/app/build.gradle +++ b/AdaptiveUiCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { resources { @@ -65,7 +65,7 @@ android { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) androidTestImplementation(composeBom) @@ -76,13 +76,13 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" implementation 'androidx.activity:activity-compose:1.7.2' - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.window:window:1.1.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" - implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha02" + implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha08" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle index 2558b7c03..b48f637f7 100644 --- a/AdaptiveUiCodelab/build.gradle +++ b/AdaptiveUiCodelab/build.gradle @@ -14,12 +14,20 @@ * limitations under the License. */ -plugins { - id 'com.android.application' version "8.0.2" apply false - id 'com.android.library' version "8.0.2" apply false - id 'org.jetbrains.kotlin.android' version "1.9.10" apply false +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:8.1.1" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + } } -task clean(type: Delete) { - delete rootProject.buildDir +subprojects { + repositories { + google() + mavenCentral() + } } diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/AdaptiveUiCodelab/settings.gradle b/AdaptiveUiCodelab/settings.gradle index b5d0c59c9..17673f04e 100644 --- a/AdaptiveUiCodelab/settings.gradle +++ b/AdaptiveUiCodelab/settings.gradle @@ -14,19 +14,5 @@ * limitations under the License. */ -pluginManagement { - repositories { - gradlePluginPortal() - google() - mavenCentral() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} rootProject.name = "Reply" include ':app' diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index af8230872..3efc5197d 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { @@ -110,7 +110,7 @@ dependencies { implementation "androidx.activity:activity-compose:1.7.2" implementation "androidx.appcompat:appcompat:1.6.1" - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -124,12 +124,12 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.6.1" + def lifecycle_version = "2.6.2" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" - implementation "com.google.dagger:hilt-android:2.46.1" - kapt "com.google.dagger:hilt-compiler:2.46.1" + implementation "com.google.dagger:hilt-android:2.48" + kapt "com.google.dagger:hilt-compiler:2.48" implementation "io.coil-kt:coil-compose:2.4.0" @@ -140,7 +140,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3" - androidTestImplementation "com.google.dagger:hilt-android:2.46.1" - androidTestImplementation "com.google.dagger:hilt-android-testing:2.46.1" - kaptAndroidTest "com.google.dagger:hilt-compiler:2.46.1" + androidTestImplementation "com.google.dagger:hilt-android:2.48" + androidTestImplementation "com.google.dagger:hilt-android-testing:2.48" + kaptAndroidTest "com.google.dagger:hilt-compiler:2.48" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 07a33a5dc..e8c3ebc67 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,14 +20,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.0.2" + classpath "com.android.tools.build:gradle:8.1.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" - classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.48" } } plugins { - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } subprojects { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index d61080ca3..0378057cc 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { resources { @@ -63,18 +63,18 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) androidTestImplementation(composeBom) - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.ui:ui" implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material3:material3-window-size-class:1.1.1' + implementation 'androidx.compose.material3:material3-window-size-class:1.1.2' implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.9.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' implementation 'androidx.activity:activity-compose:1.7.2' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 15ddc14c7..96883a1e1 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -13,12 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:8.1.1" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" + } +} plugins { - id 'com.android.application' version '8.0.2' apply false - id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.9.10' apply false - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } subprojects { diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/BasicLayoutsCodelab/settings.gradle b/BasicLayoutsCodelab/settings.gradle index 797d1083b..a4cf5c4fa 100644 --- a/BasicLayoutsCodelab/settings.gradle +++ b/BasicLayoutsCodelab/settings.gradle @@ -13,19 +13,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -pluginManagement { - repositories { - gradlePluginPortal() - google() - mavenCentral() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} rootProject.name = "MySoothe" include ':app' diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index f31ba23b5..71d5f2a9d 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable @@ -61,26 +61,26 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) androidTestImplementation(composeBom) - kapt "androidx.room:room-compiler:2.5.1" - kapt "com.github.bumptech.glide:compiler:4.15.1" + kapt "androidx.room:room-compiler:2.5.2" + kapt "com.github.bumptech.glide:compiler:4.16.0" implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation "androidx.core:core-ktx:1.10.1" - implementation "androidx.fragment:fragment-ktx:1.6.0" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - implementation "androidx.navigation:navigation-fragment-ktx:2.6.0" - implementation "androidx.navigation:navigation-ui-ktx:2.6.0" - implementation "androidx.recyclerview:recyclerview:1.3.0" - implementation "androidx.room:room-runtime:2.5.1" - implementation "androidx.room:room-ktx:2.5.1" + implementation "androidx.core:core-ktx:1.12.0" + implementation "androidx.fragment:fragment-ktx:1.6.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" + implementation "androidx.navigation:navigation-fragment-ktx:2.7.3" + implementation "androidx.navigation:navigation-ui-ktx:2.7.3" + implementation "androidx.recyclerview:recyclerview:1.3.1" + implementation "androidx.room:room-runtime:2.5.2" + implementation "androidx.room:room-ktx:2.5.2" implementation "androidx.viewpager2:viewpager2:1.0.0" implementation "androidx.work:work-runtime-ktx:2.8.1" - implementation "com.github.bumptech.glide:glide:4.15.1" + implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.9.0" implementation "com.google.code.gson:gson:2.10.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" @@ -105,7 +105,7 @@ dependencies { androidTestImplementation "androidx.test.ext:junit:1.1.5" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0" androidTestImplementation "androidx.work:work-testing:2.8.1" - androidTestImplementation "com.google.truth:truth:1.1.4" + androidTestImplementation "com.google.truth:truth:1.1.5" androidTestImplementation "androidx.compose.ui:ui-test-junit4" testImplementation "junit:junit:4.13.2" } \ No newline at end of file diff --git a/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt b/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt index c9f5fecfb..de873f228 100644 --- a/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt +++ b/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt @@ -43,8 +43,8 @@ interface GardenPlantingDao { fun getPlantedGardens(): LiveData> @Insert - suspend fun insertGardenPlanting(gardenPlanting: GardenPlanting): Long + fun insertGardenPlanting(gardenPlanting: GardenPlanting): Long @Delete - suspend fun deleteGardenPlanting(gardenPlanting: GardenPlanting) + fun deleteGardenPlanting(gardenPlanting: GardenPlanting) } diff --git a/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/PlantDao.kt b/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/PlantDao.kt index 1d72b4478..fba4e5334 100644 --- a/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/PlantDao.kt +++ b/MigrationCodelab/app/src/main/java/com/google/samples/apps/sunflower/data/PlantDao.kt @@ -37,5 +37,5 @@ interface PlantDao { fun getPlant(plantId: String): LiveData @Insert(onConflict = OnConflictStrategy.REPLACE) - suspend fun insertAll(plants: List) + fun insertAll(plants: List) } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index e5520915b..106aedd6c 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,14 +21,14 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.0.2" + classpath "com.android.tools.build:gradle:8.1.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.3" } } plugins { - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } allprojects { diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 9e5837c26..0d8b2778a 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { @@ -80,12 +80,12 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.6.1" - implementation "androidx.core:core-ktx:1.10.1" + implementation "androidx.core:core-ktx:1.12.0" implementation "com.google.android.material:material:1.9.0" // Compose @@ -95,7 +95,7 @@ dependencies { implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" implementation "androidx.activity:activity-compose:1.7.2" - implementation "androidx.navigation:navigation-compose:2.6.0" + implementation "androidx.navigation:navigation-compose:2.7.3" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index ebe185599..0f36c537e 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.0.2" + classpath "com.android.tools.build:gradle:8.1.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" } } plugins { - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } subprojects { diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index bcf281747..5348e2d0e 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 1be0a5c82..43e3731f9 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -25,15 +25,15 @@ buildscript { // App dependencies appCompatVersion = '1.6.1' activityComposeVersion = '1.7.2' - composeCompilerVersion = '1.4.8' + composeCompilerVersion = '1.5.3' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.5.1' - fragmentVersion = '1.6.0' + fragmentVersion = '1.6.1' junitVersion = '4.13.1' kotlinVersion = '1.9.10' ktlintVersion = '0.48.2' - ktxVersion = '1.10.1' + ktxVersion = '1.12.0' lifecycleVersion = '2.3.0' materialVersion = '1.9.0' runnerVersion = '1.0.1' @@ -49,13 +49,13 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.0.2" + classpath "com.android.tools.build:gradle:8.1.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } plugins { - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } subprojects { diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 1ab726e3f..87299bc24 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.8' + kotlinCompilerExtensionVersion '1.5.3' } packagingOptions { @@ -90,7 +90,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.09.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -114,13 +114,13 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.activity:activity-ktx:1.7.2' - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.activity:activity-compose:1.7.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2" androidTestImplementation 'androidx.test:rules:1.5.0' androidTestImplementation 'androidx.test:runner:1.5.2' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index ad861c8f2..f79bda4c8 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,13 +21,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10" } } plugins { - id 'com.diffplug.spotless' version '6.19.0' + id 'com.diffplug.spotless' version '6.21.0' } subprojects { diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..c30b486a8 100644 --- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ThemingCodelab/settings.gradle.kts b/ThemingCodelab/settings.gradle.kts index 565582645..592215332 100644 --- a/ThemingCodelab/settings.gradle.kts +++ b/ThemingCodelab/settings.gradle.kts @@ -13,26 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -val snapshotVersion : String? = System.getenv("COMPOSE_SNAPSHOT_ID") -pluginManagement { - repositories { - gradlePluginPortal() - google() - mavenCentral() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - snapshotVersion?.let { - println("https://androidx.dev/snapshots/builds/$it/artifacts/repository/") - maven { url = uri("https://androidx.dev/snapshots/builds/$it/artifacts/repository/") } - } - - google() - mavenCentral() - } -} rootProject.name = "Reply" include(":app")