From ad75118df4777ce07d77ba4e573af79a757d6ae7 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 13 Aug 2024 16:23:18 +0100 Subject: [PATCH 1/6] Fix publishing and deps --- build.gradle.kts | 12 ++++++++++++ gradle/libs.versions.toml | 19 +++++++++---------- renovate.json | 17 ++++------------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 87e414d9c8..563def9e33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,7 @@ import com.android.build.gradle.LibraryExtension +import com.vanniktech.maven.publish.AndroidSingleVariantLibrary +import com.vanniktech.maven.publish.JavaLibrary +import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.SonatypeHost import org.jetbrains.kotlin.gradle.dsl.JvmTarget import java.net.URL @@ -71,6 +74,15 @@ allprojects { plugins.withId("com.vanniktech.maven.publish") { mavenPublishing { + if (project.plugins.hasPlugin("com.android.library")) { + configure(AndroidSingleVariantLibrary( + variant = "release", + sourcesJar = true, + publishJavadocJar = false + )) + } else if (project.plugins.hasPlugin("java-library")) { + configure(JavaLibrary(javadocJar = JavadocJar.Empty(), sourcesJar = true)) + } publishToMavenCentral(SonatypeHost("https://google.oss.sonatype.org")) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1d9ffe8d5..5bfae47696 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,27 +15,26 @@ androidx-wear-watchface = "1.2.1" androidxActivity = "1.9.1" androidxCore = "1.13.1" androidxLifecycle = "2.8.4" -androidxNavigation = "2.8.0-beta06" +androidxNavigation = "2.8.0-beta07" androidxPhoneInteractions = "1.1.0-alpha04" androidxRemoteInteractions = "1.1.0-beta01" androidxStartup = "1.1.1" androidxTracing = "1.2.0" androidxWear = "1.3.0" -androidxWork = "2.9.0" -androidxprotolayout = "1.2.0-rc01" -androidxtiles = "1.4.0-rc01" +androidxWork = "2.9.1" +androidxprotolayout = "1.2.0" +androidxtiles = "1.4.0" annotation = "1.0.1" app-cash-turbine = "1.1.0" com-squareup-okhttp3 = "5.0.0-alpha.14" com-squareup-retrofit2 = "2.11.0" -compose = "1.7.0-beta06" -compose-compiler = "1.5.14" +compose = "1.7.0-beta07" compose-material3 = "1.3.0-beta05" composesnapshot = "-" dependencyAnalysis = "1.33.0" dokka = "1.9.20" googledagger = "2.52" -gradlePlugin = "8.4.2" +gradlePlugin = "8.6.0-rc01" gradlePublishPlugin = "0.29.0" io-coil-kt = "2.7.0" junit = "4.13.2" @@ -54,7 +53,7 @@ roborazzi = "1.26.0" room = "2.6.1" runtimeTracing = "1.0.0-beta01" spotless = "6.25.0" -tiles-tooling-preview = "1.4.0-rc01" +tiles-tooling-preview = "1.4.0" truth = "1.4.4" wearcompose = "1.4.0-beta03" wearToolingPreview = "1.0.0" @@ -68,7 +67,7 @@ android-tools-build-gradle = { module = "com.android.tools.build:gradle", versio androidx-activity = { module = "androidx.activity:activity", version.ref = "androidxActivity" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -androidx-annotation = "androidx.annotation:annotation:1.8.1" +androidx-annotation = "androidx.annotation:annotation:1.8.2" androidx-benchmark-junit4 = { module = "androidx.benchmark:benchmark-junit4", version.ref = "androidx-benchmark" } androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" } androidx-complications-data = { module = "androidx.wear.watchface:watchface-complications-data", version.ref = "androidx-complications-data" } @@ -108,7 +107,7 @@ androidx-metrics-performance = "androidx.metrics:metrics-performance:1.0.0-beta0 androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigation" } -androidx-paging = "androidx.paging:paging-compose:3.3.1" +androidx-paging = "androidx.paging:paging-compose:3.3.2" androidx-palette-ktx = "androidx.palette:palette-ktx:1.0.0" androidx-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "runtimeTracing" } androidx-startup = { module = "androidx.startup:startup-runtime", version.ref = "androidxStartup" } diff --git a/renovate.json b/renovate.json index e4e3db2595..67b20a30c9 100644 --- a/renovate.json +++ b/renovate.json @@ -18,34 +18,25 @@ "matchPackagePatterns": [ "org.jetbrains.kotlin.*" ], - "groupName": "kotlin", - "allowedVersions": "<2.0.0" + "groupName": "kotlin" }, { "matchPackagePatterns": [ "com.google.devtools.ksp" ], - "groupName": "kotlin", - "allowedVersions": "<2.0.0" + "groupName": "kotlin" }, { "matchPackagePatterns": [ - "com.android.tools.build:gradle" + "org.jetbrains.kotlinx:kotlinx-serialization-.*" ], - "allowedVersions": "<8.3.0" + "groupName": "kotlin" }, { "matchPackagePatterns": [ "com.mikepenz:multiplatform-markdown-renderer" ], "allowedVersions": "/coil2/" - }, - { - "matchPackagePatterns": [ - "org.jetbrains.kotlinx:kotlinx-serialization-.*" - ], - "groupName": "kotlin", - "allowedVersions": "<1.7.0" } ] } From 9d8db919d8414f33b5418512d5918fc2f5e01700 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 13 Aug 2024 16:47:17 +0100 Subject: [PATCH 2/6] Fix publishing and deps --- ai/sample/core/build.gradle.kts | 2 +- ai/sample/phone/build.gradle.kts | 2 +- ai/sample/wear-core/build.gradle.kts | 2 +- ai/sample/wear-gemini/build.gradle.kts | 2 +- ai/sample/wear-prompt-app/build.gradle.kts | 2 +- ai/ui/build.gradle.kts | 2 +- auth/composables/build.gradle.kts | 2 +- auth/data-phone/build.gradle.kts | 2 +- auth/data/build.gradle.kts | 2 +- auth/sample/phone/build.gradle.kts | 2 +- auth/sample/shared/build.gradle.kts | 2 +- auth/sample/wear/build.gradle.kts | 2 +- auth/ui/build.gradle.kts | 2 +- composables/build.gradle.kts | 2 +- compose-layout/build.gradle.kts | 2 +- compose-material/build.gradle.kts | 2 +- compose-tools/build.gradle.kts | 2 +- datalayer/core/build.gradle.kts | 2 +- datalayer/grpc/build.gradle.kts | 2 +- datalayer/phone-ui/build.gradle.kts | 2 +- datalayer/phone/build.gradle.kts | 2 +- datalayer/sample/phone/build.gradle.kts | 2 +- datalayer/sample/shared/build.gradle.kts | 2 +- datalayer/sample/wear/build.gradle.kts | 2 +- datalayer/watch/build.gradle.kts | 2 +- health/composables/build.gradle.kts | 2 +- health/service/build.gradle.kts | 2 +- images/base/build.gradle.kts | 2 +- images/coil/build.gradle.kts | 2 +- logo/build.gradle.kts | 2 +- media/audio-ui/build.gradle.kts | 2 +- media/audio/build.gradle.kts | 2 +- media/backend-media3/build.gradle.kts | 2 +- media/benchmark/build.gradle.kts | 2 +- media/data/build.gradle.kts | 2 +- media/media3-logging/build.gradle.kts | 2 +- media/media3-outputswitcher/build.gradle.kts | 2 +- media/sample-benchmark/build.gradle.kts | 2 +- media/sample/build.gradle.kts | 2 +- media/sync/build.gradle.kts | 2 +- media/ui/build.gradle.kts | 2 +- network-awareness/core/build.gradle.kts | 2 +- network-awareness/db/build.gradle.kts | 2 +- network-awareness/okhttp/build.gradle.kts | 2 +- network-awareness/ui/build.gradle.kts | 2 +- roboscreenshots/build.gradle.kts | 2 +- sample/build.gradle.kts | 2 +- tiles/build.gradle.kts | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ai/sample/core/build.gradle.kts b/ai/sample/core/build.gradle.kts index 6a9c05d937..f90b66e00a 100644 --- a/ai/sample/core/build.gradle.kts +++ b/ai/sample/core/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/ai/sample/phone/build.gradle.kts b/ai/sample/phone/build.gradle.kts index 4316ad69c4..f4fecbc3e2 100644 --- a/ai/sample/phone/build.gradle.kts +++ b/ai/sample/phone/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.ai.sample" diff --git a/ai/sample/wear-core/build.gradle.kts b/ai/sample/wear-core/build.gradle.kts index 8c8bc41a84..1865e77560 100644 --- a/ai/sample/wear-core/build.gradle.kts +++ b/ai/sample/wear-core/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 30 diff --git a/ai/sample/wear-gemini/build.gradle.kts b/ai/sample/wear-gemini/build.gradle.kts index 6045551c8a..bd9a9318b8 100644 --- a/ai/sample/wear-gemini/build.gradle.kts +++ b/ai/sample/wear-gemini/build.gradle.kts @@ -49,7 +49,7 @@ val localProperties = Properties().apply { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.ai.sample.wear.gemini" diff --git a/ai/sample/wear-prompt-app/build.gradle.kts b/ai/sample/wear-prompt-app/build.gradle.kts index 3613a4c0ab..3be8461858 100644 --- a/ai/sample/wear-prompt-app/build.gradle.kts +++ b/ai/sample/wear-prompt-app/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.ai.sample.prompt" diff --git a/ai/ui/build.gradle.kts b/ai/ui/build.gradle.kts index a150e37b12..616fddad77 100644 --- a/ai/ui/build.gradle.kts +++ b/ai/ui/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/auth/composables/build.gradle.kts b/auth/composables/build.gradle.kts index 1526b33e55..18fc382def 100644 --- a/auth/composables/build.gradle.kts +++ b/auth/composables/build.gradle.kts @@ -25,7 +25,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/auth/data-phone/build.gradle.kts b/auth/data-phone/build.gradle.kts index 70ab2b45c7..9235c1f855 100644 --- a/auth/data-phone/build.gradle.kts +++ b/auth/data-phone/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/auth/data/build.gradle.kts b/auth/data/build.gradle.kts index 6496c61219..f5acc47d3b 100644 --- a/auth/data/build.gradle.kts +++ b/auth/data/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/auth/sample/phone/build.gradle.kts b/auth/sample/phone/build.gradle.kts index f9b2fc2c87..16b9282f15 100644 --- a/auth/sample/phone/build.gradle.kts +++ b/auth/sample/phone/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.auth.sample" diff --git a/auth/sample/shared/build.gradle.kts b/auth/sample/shared/build.gradle.kts index f5bcc92705..3ec18ea8d8 100644 --- a/auth/sample/shared/build.gradle.kts +++ b/auth/sample/shared/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/auth/sample/wear/build.gradle.kts b/auth/sample/wear/build.gradle.kts index ae2c6dcded..96a138a536 100644 --- a/auth/sample/wear/build.gradle.kts +++ b/auth/sample/wear/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.auth.sample" diff --git a/auth/ui/build.gradle.kts b/auth/ui/build.gradle.kts index 4adcf1e528..5fc1c72f72 100644 --- a/auth/ui/build.gradle.kts +++ b/auth/ui/build.gradle.kts @@ -25,7 +25,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/composables/build.gradle.kts b/composables/build.gradle.kts index 43d03c7458..ae979c981c 100644 --- a/composables/build.gradle.kts +++ b/composables/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/compose-layout/build.gradle.kts b/compose-layout/build.gradle.kts index 7ba27d4e30..38253c561d 100644 --- a/compose-layout/build.gradle.kts +++ b/compose-layout/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/compose-material/build.gradle.kts b/compose-material/build.gradle.kts index fd21df054f..b0b9da21f7 100644 --- a/compose-material/build.gradle.kts +++ b/compose-material/build.gradle.kts @@ -25,7 +25,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/compose-tools/build.gradle.kts b/compose-tools/build.gradle.kts index 8ca98f8ab0..7c0912620e 100644 --- a/compose-tools/build.gradle.kts +++ b/compose-tools/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/datalayer/core/build.gradle.kts b/datalayer/core/build.gradle.kts index ac5067b5be..1e6f4163ff 100644 --- a/datalayer/core/build.gradle.kts +++ b/datalayer/core/build.gradle.kts @@ -25,7 +25,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/datalayer/grpc/build.gradle.kts b/datalayer/grpc/build.gradle.kts index 5b42433d9b..23d1d66979 100644 --- a/datalayer/grpc/build.gradle.kts +++ b/datalayer/grpc/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/datalayer/phone-ui/build.gradle.kts b/datalayer/phone-ui/build.gradle.kts index 26d23eeb6b..4df6332350 100644 --- a/datalayer/phone-ui/build.gradle.kts +++ b/datalayer/phone-ui/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/datalayer/phone/build.gradle.kts b/datalayer/phone/build.gradle.kts index e3c5bc9dc0..0e8d2424a2 100644 --- a/datalayer/phone/build.gradle.kts +++ b/datalayer/phone/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/datalayer/sample/phone/build.gradle.kts b/datalayer/sample/phone/build.gradle.kts index b099f98ddc..ff3fe8f2ab 100644 --- a/datalayer/sample/phone/build.gradle.kts +++ b/datalayer/sample/phone/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.datalayer.sample" diff --git a/datalayer/sample/shared/build.gradle.kts b/datalayer/sample/shared/build.gradle.kts index a87bd70eb1..8f4e2c565b 100644 --- a/datalayer/sample/shared/build.gradle.kts +++ b/datalayer/sample/shared/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 diff --git a/datalayer/sample/wear/build.gradle.kts b/datalayer/sample/wear/build.gradle.kts index 414ec816a0..4009003501 100644 --- a/datalayer/sample/wear/build.gradle.kts +++ b/datalayer/sample/wear/build.gradle.kts @@ -26,7 +26,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.datalayer.sample" diff --git a/datalayer/watch/build.gradle.kts b/datalayer/watch/build.gradle.kts index 7ce0f4b9a3..bbfd846046 100644 --- a/datalayer/watch/build.gradle.kts +++ b/datalayer/watch/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/health/composables/build.gradle.kts b/health/composables/build.gradle.kts index ca6ee6613d..c65495d350 100644 --- a/health/composables/build.gradle.kts +++ b/health/composables/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 30 diff --git a/health/service/build.gradle.kts b/health/service/build.gradle.kts index 86f90ee0a4..3acfcc2405 100644 --- a/health/service/build.gradle.kts +++ b/health/service/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 30 diff --git a/images/base/build.gradle.kts b/images/base/build.gradle.kts index aff46cc96b..96aa472a8a 100644 --- a/images/base/build.gradle.kts +++ b/images/base/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/images/coil/build.gradle.kts b/images/coil/build.gradle.kts index 94a10284f3..9c1160b7ba 100644 --- a/images/coil/build.gradle.kts +++ b/images/coil/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/logo/build.gradle.kts b/logo/build.gradle.kts index e28effae0c..20504d26b7 100644 --- a/logo/build.gradle.kts +++ b/logo/build.gradle.kts @@ -20,5 +20,5 @@ plugins { android { namespace = "com.google.android.horologist.logo" - compileSdk = 34 + compileSdk = 35 } diff --git a/media/audio-ui/build.gradle.kts b/media/audio-ui/build.gradle.kts index d629e717be..710736bf79 100644 --- a/media/audio-ui/build.gradle.kts +++ b/media/audio-ui/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/audio/build.gradle.kts b/media/audio/build.gradle.kts index 0b7a62bbbb..11fb1fddfb 100644 --- a/media/audio/build.gradle.kts +++ b/media/audio/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/backend-media3/build.gradle.kts b/media/backend-media3/build.gradle.kts index 2782dfb95a..35066cf2e4 100644 --- a/media/backend-media3/build.gradle.kts +++ b/media/backend-media3/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/benchmark/build.gradle.kts b/media/benchmark/build.gradle.kts index 1713073bce..e157dc0e0b 100644 --- a/media/benchmark/build.gradle.kts +++ b/media/benchmark/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 30 diff --git a/media/data/build.gradle.kts b/media/data/build.gradle.kts index 03c152c5c3..46ce4ed91f 100644 --- a/media/data/build.gradle.kts +++ b/media/data/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/media3-logging/build.gradle.kts b/media/media3-logging/build.gradle.kts index 46e239c789..d9ef853d59 100644 --- a/media/media3-logging/build.gradle.kts +++ b/media/media3-logging/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/media3-outputswitcher/build.gradle.kts b/media/media3-outputswitcher/build.gradle.kts index 803923de50..83da89eee1 100644 --- a/media/media3-outputswitcher/build.gradle.kts +++ b/media/media3-outputswitcher/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/sample-benchmark/build.gradle.kts b/media/sample-benchmark/build.gradle.kts index 0098c4ad70..23ed2d2525 100644 --- a/media/sample-benchmark/build.gradle.kts +++ b/media/sample-benchmark/build.gradle.kts @@ -21,7 +21,7 @@ plugins { android { namespace = "com.google.android.horologist.mediasample.benchmark" - compileSdk = 34 + compileSdk = 35 compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/media/sample/build.gradle.kts b/media/sample/build.gradle.kts index cfdbb46a7e..8da71ea8f1 100644 --- a/media/sample/build.gradle.kts +++ b/media/sample/build.gradle.kts @@ -34,7 +34,7 @@ if (localFile.exists()) { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.mediasample" diff --git a/media/sync/build.gradle.kts b/media/sync/build.gradle.kts index d38aec98b9..28350badab 100644 --- a/media/sync/build.gradle.kts +++ b/media/sync/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/media/ui/build.gradle.kts b/media/ui/build.gradle.kts index 70c18a25ff..364164e937 100644 --- a/media/ui/build.gradle.kts +++ b/media/ui/build.gradle.kts @@ -25,7 +25,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/network-awareness/core/build.gradle.kts b/network-awareness/core/build.gradle.kts index 02e9bf37b9..60b3151b9b 100644 --- a/network-awareness/core/build.gradle.kts +++ b/network-awareness/core/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/network-awareness/db/build.gradle.kts b/network-awareness/db/build.gradle.kts index 49d6f774dc..e44e0f1d73 100644 --- a/network-awareness/db/build.gradle.kts +++ b/network-awareness/db/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/network-awareness/okhttp/build.gradle.kts b/network-awareness/okhttp/build.gradle.kts index 3485d985bc..933233db16 100644 --- a/network-awareness/okhttp/build.gradle.kts +++ b/network-awareness/okhttp/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/network-awareness/ui/build.gradle.kts b/network-awareness/ui/build.gradle.kts index cb5903c7aa..b04f5ce2e3 100644 --- a/network-awareness/ui/build.gradle.kts +++ b/network-awareness/ui/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/roboscreenshots/build.gradle.kts b/roboscreenshots/build.gradle.kts index a2d37a33d7..e7d5635b39 100644 --- a/roboscreenshots/build.gradle.kts +++ b/roboscreenshots/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 26 diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index eecde8d9ab..96f7cf835a 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -27,7 +27,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.android.horologist.sample" diff --git a/tiles/build.gradle.kts b/tiles/build.gradle.kts index d644017b1f..8b16f33ef9 100644 --- a/tiles/build.gradle.kts +++ b/tiles/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - compileSdk = 34 + compileSdk = 35 defaultConfig { // Tiles is API 26, but if we don't stop this here, then we can't run the sample app From e2ed9230f722128aee5a69dab18a61853a2f9e0b Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 13 Aug 2024 18:03:08 +0100 Subject: [PATCH 3/6] Fix publishing and deps --- .../horologist/screenshots/a11y/A11ySnapshotTransformer.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt index 09cfdb3a9e..7be6b2efa0 100644 --- a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt +++ b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt @@ -58,7 +58,11 @@ internal class A11ySnapshotTransformer : SnapshotTransformer { } } - return Bitmap.createBitmap(bitmap.width * 2, bitmap.height, bitmap.config).apply { + return Bitmap.createBitmap( + bitmap.width * 2, + bitmap.height, + bitmap.config ?: Bitmap.Config.ARGB_8888 + ).apply { val canvas = Canvas(this) drawImageWithOverlays(canvas, bitmap) From 428713edce22401510578beb30c8277013c99f24 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 13 Aug 2024 18:16:25 +0100 Subject: [PATCH 4/6] Fix publishing and deps --- .../horologist/datalayer/phone/PhoneDataLayerAppHelper.kt | 2 +- .../horologist/screenshots/a11y/A11ySnapshotTransformer.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datalayer/phone/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt b/datalayer/phone/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt index ae039b9c34..5c9c962bb0 100644 --- a/datalayer/phone/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt +++ b/datalayer/phone/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt @@ -117,7 +117,7 @@ public class PhoneDataLayerAppHelper( context.packageManager.getPackageInfo("com.google.android.apps.wear.companion", 0) val version = packageInfo.versionName - val companionVersion = Version.parse(version) + val companionVersion = version?.let { Version.parse(version) } if (companionVersion != null && companionVersion >= RequiredCompanionVersion) { AppHelperResultCode.APP_HELPER_RESULT_SUCCESS } else { diff --git a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt index 7be6b2efa0..15b897cffa 100644 --- a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt +++ b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/a11y/A11ySnapshotTransformer.kt @@ -61,7 +61,7 @@ internal class A11ySnapshotTransformer : SnapshotTransformer { return Bitmap.createBitmap( bitmap.width * 2, bitmap.height, - bitmap.config ?: Bitmap.Config.ARGB_8888 + bitmap.config ?: Bitmap.Config.ARGB_8888, ).apply { val canvas = Canvas(this) From 324914ab840837ac8254f5547a6487f2f054933e Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Wed, 14 Aug 2024 08:55:51 +0100 Subject: [PATCH 5/6] Fix publishing and deps --- .../android/horologist/audio/ui/VolumePositionIndicator.kt | 2 ++ .../audio/ui/components/animated/AnimatedSetVolumeButton.kt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/VolumePositionIndicator.kt b/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/VolumePositionIndicator.kt index df2ea69f8a..15f82d12f3 100644 --- a/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/VolumePositionIndicator.kt +++ b/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/VolumePositionIndicator.kt @@ -44,6 +44,8 @@ public fun VolumePositionIndicator( displayIndicatorEvents: Flow? = null, color: Color = MaterialTheme.colors.secondary, ) { + // False positive - https://issuetracker.google.com/issues/349411310 + @Suppress("ProduceStateDoesNotAssignValue") val visible by produceState(displayIndicatorEvents == null, displayIndicatorEvents) { displayIndicatorEvents?.collectLatest { value = true diff --git a/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt b/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt index 3381cd015e..85cdcc3ff5 100644 --- a/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt +++ b/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue @@ -53,7 +54,7 @@ public fun AnimatedSetVolumeButton( ) val lottieAnimatable = rememberLottieAnimatable() - var lastVolume by remember { mutableStateOf(volumeUiState.current) } + var lastVolume by remember { mutableIntStateOf(volumeUiState.current) } LaunchedEffect(volumeUiState) { val lastVolumeBefore = lastVolume From ce9899a8948ea5a7f82bd9cbddde2da8cf70e353 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Wed, 14 Aug 2024 09:12:42 +0100 Subject: [PATCH 6/6] Fix publishing and deps --- .gitignore | 3 +++ .idea/assetWizardSettings.xml | 14 -------------- .../components/animated/AnimatedSetVolumeButton.kt | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 .idea/assetWizardSettings.xml diff --git a/.gitignore b/.gitignore index 47eb2a0efc..fa75cc57f6 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,10 @@ checksum.txt # Paparazzi failures output folder out/ + /.idea/shelf /.idea/deploymentTargetSelector.xml /.idea/appInsightsSettings.xml /.kotlin/**/* +/.idea/runConfigurations.xml +/.idea/assetWizardSettings.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index 2a9c5e01a6..0000000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt b/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt index 85cdcc3ff5..d555348ba7 100644 --- a/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt +++ b/media/audio-ui/src/main/java/com/google/android/horologist/audio/ui/components/animated/AnimatedSetVolumeButton.kt @@ -21,7 +21,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier