diff --git a/Crane/app/build.gradle b/Crane/app/build.gradle index 2c50115352..0ebe624276 100644 --- a/Crane/app/build.gradle +++ b/Crane/app/build.gradle @@ -112,6 +112,14 @@ android { excludes += "/META-INF/AL2.0" excludes += "/META-INF/LGPL2.1" } + + // TODO: Lint issues https://github.com/android/compose-samples/issues/800 + // Lint fails to run for this sample and suggests disabling these specific checks. That at least + // lets us verify everything else is working, but we should figure out why the error is + // happening. + lintOptions { + disable "JvmStaticProvidesInObjectDetector", "FieldSiteTargetOnQualifierAnnotation", "ModuleCompanionObjects", "ModuleCompanionObjectsNotInModuleParent" + } } dependencies { diff --git a/Crane/build.gradle b/Crane/build.gradle index dccc5067e6..f1412ec977 100644 --- a/Crane/build.gradle +++ b/Crane/build.gradle @@ -30,7 +30,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.4.2' + id 'com.diffplug.spotless' version '6.5.2' } subprojects { diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt index 08dac95264..8566e0ef26 100644 --- a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt +++ b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.2" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0" const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}" const val coreLibraryDesugar = "com.android.tools:desugar_jdk_libs:1.1.5" @@ -36,7 +36,7 @@ object Libs { } object Kotlin { - private const val version = "1.6.20" + private const val version = "1.6.21" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" @@ -57,7 +57,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-alpha08" + const val version = "1.2.0-beta01" const val runtime = "androidx.compose.runtime:runtime:$version" const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version" diff --git a/Crane/gradle/wrapper/gradle-wrapper.properties b/Crane/gradle/wrapper/gradle-wrapper.properties index d2880ba800..aa991fceae 100644 --- a/Crane/gradle/wrapper/gradle-wrapper.properties +++ b/Crane/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/JetNews/build.gradle b/JetNews/build.gradle index 3afa110a95..680869ac9f 100644 --- a/JetNews/build.gradle +++ b/JetNews/build.gradle @@ -15,11 +15,11 @@ */ buildscript { - ext.kotlin_version = '1.6.20' - ext.compose_version = '1.2.0-alpha08' + ext.kotlin_version = '1.6.21' + ext.compose_version = '1.2.0-beta01' ext.compose_snapshot_version = '' ext.coroutines_version = '1.6.0' - ext.accompanist_version = '0.24.7-alpha' + ext.accompanist_version = '0.24.8-beta' repositories { google() @@ -27,13 +27,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } plugins { - id 'com.diffplug.spotless' version '6.4.2' + id 'com.diffplug.spotless' version '6.5.2' } subprojects { diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties index d2880ba800..aa991fceae 100644 --- a/JetNews/gradle/wrapper/gradle-wrapper.properties +++ b/JetNews/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt index 8e5d069792..f71bd01d8a 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt @@ -69,7 +69,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel -import coil.annotation.ExperimentalCoilApi import coil.compose.rememberImagePainter import com.example.jetcaster.R import com.example.jetcaster.data.PodcastWithExtraInfo @@ -344,7 +343,6 @@ fun FollowedPodcasts( } } -@OptIn(ExperimentalCoilApi::class) @Composable private fun FollowedPodcastCarouselItem( modifier: Modifier = Modifier, diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt index 56df6a841e..f4af4b8f4a 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt @@ -56,6 +56,6 @@ val PreviewEpisodes = listOf( podcastUri = PreviewPodcasts[0].uri, title = "Episode 140: Bubbles!", summary = "In this episode, Romain, Chet and Tor talked with Mady Melor and Artur Tsurkan from the System UI team about... Bubbles!", - published = OffsetDateTime.of(2020, 6, 2, 9, 27, 0, 0, ZoneOffset.of("PST")) + published = OffsetDateTime.of(2020, 6, 2, 9, 27, 0, 0, ZoneOffset.of("-0800")) ) ) diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle index 796f7bbc78..2ac034b580 100644 --- a/Jetcaster/build.gradle +++ b/Jetcaster/build.gradle @@ -30,7 +30,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.4.2' + id 'com.diffplug.spotless' version '6.5.2' } subprojects { diff --git a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt index 037ed443e5..3ef3d60a9b 100644 --- a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt +++ b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt @@ -21,16 +21,16 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.2" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5" object Accompanist { - const val version = "0.24.7-alpha" + const val version = "0.24.8-beta" const val pager = "com.google.accompanist:accompanist-pager:$version" } object Kotlin { - private const val version = "1.6.20" + private const val version = "1.6.21" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" @@ -70,7 +70,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-alpha08" + const val version = "1.2.0-beta01" @get:JvmStatic val snapshotUrl: String diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/Jetcaster/gradle/wrapper/gradle-wrapper.properties index d2880ba800..aa991fceae 100644 --- a/Jetcaster/gradle/wrapper/gradle-wrapper.properties +++ b/Jetcaster/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle index 230bf3757a..d4a1e52807 100644 --- a/Jetchat/build.gradle +++ b/Jetchat/build.gradle @@ -32,7 +32,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.4.2' + id 'com.diffplug.spotless' version '6.5.2' } subprojects { diff --git a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt index 0e2b612f28..93331c3b5e 100644 --- a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt +++ b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.2" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5" const val junit = "junit:junit:4.13" @@ -29,7 +29,7 @@ object Libs { const val material3 = "com.google.android.material:material:1.6.0-alpha03" object Kotlin { - private const val version = "1.6.20" + private const val version = "1.6.21" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" @@ -52,7 +52,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-alpha08" + const val version = "1.2.0-beta01" const val foundation = "androidx.compose.foundation:foundation:$version" const val layout = "androidx.compose.foundation:foundation-layout:$version" diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties index d2880ba800..aa991fceae 100644 --- a/Jetchat/gradle/wrapper/gradle-wrapper.properties +++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetsnack/build.gradle b/Jetsnack/build.gradle index 4619335e10..16847876ae 100644 --- a/Jetsnack/build.gradle +++ b/Jetsnack/build.gradle @@ -29,9 +29,9 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.4.2' - id 'com.android.test' version '7.3.0-alpha07' apply false - id 'org.jetbrains.kotlin.android' version '1.6.20' apply false + id 'com.diffplug.spotless' version '6.5.2' + id 'com.android.test' version '7.3.0-alpha09' apply false + id 'org.jetbrains.kotlin.android' version '1.6.21' apply false } subprojects { diff --git a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt index 8c57a3ff55..b78027800f 100644 --- a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt +++ b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt @@ -21,16 +21,16 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.3.0-alpha07" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.3.0-alpha09" object Accompanist { - const val version = "0.24.7-alpha" + const val version = "0.24.8-beta" const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version" const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version" } object Kotlin { - private const val version = "1.6.20" + private const val version = "1.6.21" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" @@ -49,7 +49,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-alpha08" + const val version = "1.2.0-beta01" const val foundation = "androidx.compose.foundation:foundation:${version}" const val layout = "androidx.compose.foundation:foundation-layout:${version}" diff --git a/Jetsnack/gradle/wrapper/gradle-wrapper.properties b/Jetsnack/gradle/wrapper/gradle-wrapper.properties index 41dfb87909..aa991fceae 100644 --- a/Jetsnack/gradle/wrapper/gradle-wrapper.properties +++ b/Jetsnack/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle index 6173a553ac..0c0d0fab8f 100644 --- a/Jetsurvey/build.gradle +++ b/Jetsurvey/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.4.2' + id 'com.diffplug.spotless' version '6.5.2' } subprojects { diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt index bc008be3e5..d02eeba0cc 100644 --- a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt +++ b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt @@ -21,18 +21,18 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.2" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0" const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5" const val junit = "junit:junit:4.13" object Accompanist { - const val version = "0.24.7-alpha" + const val version = "0.24.8-beta" const val permissions = "com.google.accompanist:accompanist-permissions:$version" } object Kotlin { - private const val version = "1.6.20" + private const val version = "1.6.21" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" @@ -61,7 +61,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-alpha08" + const val version = "1.2.0-beta01" @get:JvmStatic val snapshotUrl: String diff --git a/Jetsurvey/gradle/wrapper/gradle-wrapper.properties b/Jetsurvey/gradle/wrapper/gradle-wrapper.properties index d2880ba800..aa991fceae 100644 --- a/Jetsurvey/gradle/wrapper/gradle-wrapper.properties +++ b/Jetsurvey/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Owl/build.gradle b/Owl/build.gradle index af1eafeb82..2ee6114c31 100644 --- a/Owl/build.gradle +++ b/Owl/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.4.2' + id 'com.diffplug.spotless' version '6.5.2' } subprojects { diff --git a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt index 125f0c1e3c..e74bcd8a55 100644 --- a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt +++ b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt @@ -21,10 +21,10 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.2" + const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0" object Kotlin { - private const val version = "1.6.20" + private const val version = "1.6.21" const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" @@ -52,7 +52,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-alpha08" + const val version = "1.2.0-beta01" const val animation = "androidx.compose.animation:animation:$version" const val foundation = "androidx.compose.foundation:foundation:$version" diff --git a/Owl/gradle/wrapper/gradle-wrapper.properties b/Owl/gradle/wrapper/gradle-wrapper.properties index d2880ba800..aa991fceae 100644 --- a/Owl/gradle/wrapper/gradle-wrapper.properties +++ b/Owl/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists