Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ai/ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ metalava {
dependencies {
api(projects.annotations)

implementation(platform(libs.compose.bom))
api(libs.wearcompose.material)
api(libs.wearcompose.foundation)
implementation(libs.compose.material.iconscore)
Expand Down
1 change: 1 addition & 0 deletions auth/composables/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ dependencies {
implementation(projects.composeMaterial)
implementation(projects.images.coil)

implementation(platform(libs.compose.bom))
implementation(libs.compose.foundation.foundation)
implementation(libs.compose.foundation.foundation.layout)
implementation(libs.compose.material.iconscore)
Expand Down
1 change: 1 addition & 0 deletions auth/ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ dependencies {
api(libs.kotlinx.coroutines.core)
api(libs.wearcompose.foundation)

implementation(platform(libs.compose.bom))
implementation(projects.composeMaterial)
implementation(projects.images.coil)

Expand Down
13 changes: 1 addition & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ 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.URI
import java.util.Properties
Expand Down Expand Up @@ -115,7 +114,6 @@ allprojects {
} else if (project.plugins.hasPlugin("java-library")) {
configure(JavaLibrary(javadocJar = JavadocJar.Empty(), sourcesJar = true))
}
publishToMavenCentral(SonatypeHost("https://google.oss.sonatype.org"))
}
}
}
Expand Down Expand Up @@ -161,16 +159,6 @@ subprojects {
}
}

// Read in the signing.properties file if it is exists
val signingPropsFile = rootProject.file("release/signing.properties")
if (signingPropsFile.exists()) {
val localProperties = Properties()
signingPropsFile.inputStream().use { istream -> localProperties.load(istream) }
localProperties.forEach { prop ->
project.extra[prop.key as String] = prop.value
}
}

// Must be afterEvaluate or else com.vanniktech.maven.publish will overwrite our
// dokka and version configuration.
afterEvaluate {
Expand All @@ -180,6 +168,7 @@ subprojects {
}

tasks.named<org.jetbrains.dokka.gradle.DokkaTaskPartial>("dokkaHtmlPartial") {
failOnWarning.set(false)
dokkaSourceSets.configureEach {
reportUndocumented.set(true)
skipEmptyPackages.set(true)
Expand Down
1 change: 1 addition & 0 deletions compose-layout/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ metalava {
dependencies {
api(projects.annotations)

implementation(platform(libs.compose.bom))
api(libs.wearcompose.material)
api(libs.wearcompose.foundation)

Expand Down
1 change: 1 addition & 0 deletions compose-material/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ dependencies {
api(projects.composeLayout)
api(projects.images.base)

implementation(platform(libs.compose.bom))
api(libs.compose.foundation.foundation)
api(libs.compose.foundation.foundation.layout)
api(libs.compose.runtime)
Expand Down
1 change: 1 addition & 0 deletions compose-tools/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ dependencies {
implementation(libs.kotlin.reflect)
implementation(projects.tiles)

implementation(platform(libs.compose.bom))
implementation(libs.wearcompose.material)
implementation(libs.wearcompose.foundation)
implementation(libs.wearcompose.navigation)
Expand Down
119 changes: 0 additions & 119 deletions docs/updating-old.md

This file was deleted.

25 changes: 14 additions & 11 deletions docs/updating.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,30 @@

This doc is mostly for maintainers.

Ensure your [Sonatype JIRA](https://issues.sonatype.org/login.jsp) credentials are set in your environment variables.
Ensure your Maven Central credentials are set in ~/.gradle/gradle.properties.
Follow https://vanniktech.github.io/gradle-maven-publish-plugin/central/#secrets

```bash
export ORG_GRADLE_PROJECT_mavenCentralUsername=username
export ORG_GRADLE_PROJECT_mavenCentralPassword=password
```
mavenCentralUsername=username
mavenCentralPassword=the_password

signing.keyId=12345678
signing.password=some_password
signing.secretKeyRingFile=/Users/yourusername/.gnupg/secring.gpg
```

Decrypt the signing key to release a public build.
Publish the artifacts to staging.

```bash
release/signing-setup.sh '<Horologist AES key>'
gradlew clean publish --no-parallel --stacktrace
release/signing-cleanup.sh
./gradlew publishToMavenCentral
```

The deployment then needs to be manually released via the [Nexus Repository Manager](https://oss.sonatype.org/#stagingRepositories). See [Releasing Deployment from OSSRH](https://central.sonatype.org/publish/release/).
The deployment then needs to be manually released via the [Central Portal](https://central.sonatype.com/publishing/deployments).

## Snapshot release

For a snapshot release, the signing key is not used. Ensure `VERSION_NAME` in [gradle.properties](https://github.com/google/horologist/blob/main/gradle.properties) has the `-SNAPSHOT` suffix or specify the version via `-PVERSION_NAME=...`.
For a snapshot release, change the version of `VERSION_NAME` property in `gradle.properties` to end with -SNAPSHOT e.g. 0.8.0-SNAPSHOT.

```bash
gradlew -PVERSION_NAME=0.0.1-SNAPSHOT clean publish --no-parallel --stacktrace
./gradlew publishToMavenCentral
```
8 changes: 3 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,8 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerM
# the Gradle JVM arg value for ReservedCodeCacheSize will be used.
kotlin.daemon.jvmargs=-Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=320m -XX:+HeapDumpOnOutOfMemoryError -Xmx4g -Xms4g

# Increase timeout when pushing to Sonatype (otherwise we get timeouts)
systemProp.org.gradle.internal.http.socketTimeout=120000

GROUP=com.google.android.horologist
VERSION_NAME=0.7.15-beta
VERSION_NAME=0.7.15

POM_DESCRIPTION=Utilities for Wear OS

Expand All @@ -63,7 +60,8 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=google
POM_DEVELOPER_NAME=Google

RELEASE_SIGNING_ENABLED=true
mavenCentralPublishing=true
signAllPublications=true

# Plugin should be applied individually to modules that are reviewed, in order to avoid having
# unnecessary performance hit in CI. Once all modules are reviewed, this line can be removed, and
Expand Down
33 changes: 17 additions & 16 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ accessibilityTestFramework = "4.1.1"
accompanist = "0.36.0"
androidx-benchmark = "1.3.4"
androidx-complications-data = "1.2.1"
androidx-concurrent = "1.2.0"
androidx-concurrent = "1.3.0"
androidx-constraintlayout-compose = "1.1.1"
androidx-datastore = "1.1.7"
androidx-graphics = "1.0.1"
Expand All @@ -15,10 +15,10 @@ androidx-test-ext = "1.2.1"
androidx-test-runner = "1.6.2"
androidx-wear-watchface = "1.2.1"
androidxActivity = "1.10.1"
androidxComposeBom = "2025.06.01"
androidxComposeBom = "2025.07.00"
androidxCore = "1.16.0"
androidxLifecycle = "2.9.1"
androidxNavigation = "2.9.0"
androidxLifecycle = "2.9.2"
androidxNavigation = "2.9.2"
androidxPhoneInteractions = "1.1.0"
androidxRemoteInteractions = "1.1.0"
androidxStartup = "1.2.0"
Expand All @@ -30,46 +30,47 @@ androidxtiles = "1.5.0"
annotation = "1.0.1"
app-cash-turbine = "1.2.1"
appcompat = "1.7.1"
com-squareup-okhttp3 = "5.0.0-alpha.16"
com-squareup-okhttp3 = "5.1.0"
com-squareup-retrofit2 = "3.0.0"
compose-material3 = "1.3.2"
composesnapshot = "-"
dependencyAnalysis = "2.19.0"
desugar_jdk_libs = "2.1.5"
dokka = "2.0.0"
googledagger = "2.56.2"
gradlePlugin = "8.11.0"
gradlePublishPlugin = "0.33.0"
gradlePlugin = "8.11.1"
gradlePublishPlugin = "0.34.0"
grpcStub = "1.73.0"
io-coil-kt = "2.7.0"
junit = "4.13.2"
kotlin = "2.2.0"
kotlinxCoroutine = "1.10.2"
kotlinxSerialization = "1.8.1"
kotlinxSerialization = "1.9.0"
ksp = "2.2.0-2.0.2"
ktlint = "0.50.0"
material = "1.12.0"
metalava = "0.4.0-alpha03"
moshi = "1.15.2"
okio = "3.13.0"
okio = "3.16.0"
org-robolectric = "4.15.1"
ossLicensesPlugin = "0.10.6"
osslicenses = "0.8.0"
playServicesAuth = "21.3.0"
playServicesOssLicenses = "17.1.0"
playServicesAuth = "21.4.0"
playServicesOssLicenses = "17.2.1"
# Stay on 4.26.1 due to https://github.com/firebase/firebase-android-sdk/issues/5997
protobuf = "4.26.1"
protobuf-gen-grpc-java = "1.73.0"
protobuf-gen-grpc-kotlin = "1.4.3:jdk8@jar"
protobuf-gen-javalite = "3.0.0"
roborazzi = "1.45.1"
roborazzi = "1.46.1"
room = "2.7.2"
runtimeTracing = "1.8.3"
spotless = "7.0.4"
spotless = "7.2.1"
tiles-tooling-preview = "1.5.0"
truth = "1.4.4"
wearInput = "1.2.0-alpha02"
wearInput = "1.2.0-alpha04"
wearToolingPreview = "1.0.0"
wearcompose = "1.5.0-beta04"
wearcompose = "1.5.0-rc01"

[libraries]
accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" }
Expand Down Expand Up @@ -209,7 +210,7 @@ oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", v
osslicenses-wear-compose-material = { module = "io.github.droibit.oss-licenses-android:ui-wear-compose-material", version.ref = "osslicenses" }
play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
playservices-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" }
playservices-base = "com.google.android.gms:play-services-base:18.7.0"
playservices-base = "com.google.android.gms:play-services-base:18.7.2"
playservices-wearable = "com.google.android.gms:play-services-wearable:19.0.0"
protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" }
protobuf-protoc-gen-grpc-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "protobuf-gen-grpc-java"}
Expand Down
1 change: 1 addition & 0 deletions health/composables/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ dependencies {

implementation(projects.composeLayout)

implementation(platform(libs.compose.bom))
implementation(libs.androidx.wear)
implementation(libs.androidx.health.services)
implementation(libs.kotlin.stdlib)
Expand Down
1 change: 1 addition & 0 deletions media/audio-ui-material3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ dependencies {
api(projects.media.audioUiModel)
debugImplementation(projects.logo)

implementation(platform(libs.compose.bom))
api(libs.androidx.wear.compose.material3)
api(libs.wearcompose.foundation)
implementation(libs.androidx.corektx)
Expand Down
1 change: 1 addition & 0 deletions media/audio-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ dependencies {
api(projects.media.audioUiModel)
debugImplementation(projects.logo)

implementation(platform(libs.compose.bom))
api(libs.wearcompose.material)
api(libs.wearcompose.foundation)
implementation(libs.androidx.corektx)
Expand Down
1 change: 1 addition & 0 deletions media/ui-material3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ dependencies {
api(projects.media.core)
api(projects.tiles)

implementation(platform(libs.compose.bom))
api(projects.composables)
api(libs.androidx.wear.compose.material3)
api(libs.wearcompose.foundation)
Expand Down
Loading
Loading