Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix publishing and deps #2342

Merged
merged 7 commits into from
Aug 14, 2024
Merged

Fix publishing and deps #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad75118
Fix publishing and deps
yschimke Aug 13, 2024
9d8db91
Fix publishing and deps
yschimke Aug 13, 2024
e2ed923
Fix publishing and deps
yschimke Aug 13, 2024
428713e
Fix publishing and deps
yschimke Aug 13, 2024
324914a
Fix publishing and deps
yschimke Aug 14, 2024
fbec897
Merge branch 'main' into fix_publishing
yschimke Aug 14, 2024
ce9899a
Fix publishing and deps
yschimke Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions .idea/assetWizardSettings.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ai/sample/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion ai/sample/phone/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.ai.sample"
Expand Down
2 changes: 1 addition & 1 deletion ai/sample/wear-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 30
Expand Down
2 changes: 1 addition & 1 deletion ai/sample/wear-gemini/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ val localProperties = Properties().apply {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.ai.sample.wear.gemini"
Expand Down
2 changes: 1 addition & 1 deletion ai/sample/wear-prompt-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.ai.sample.prompt"
Expand Down
2 changes: 1 addition & 1 deletion ai/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion auth/composables/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion auth/data-phone/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion auth/data/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion auth/sample/phone/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.auth.sample"
Expand Down
2 changes: 1 addition & 1 deletion auth/sample/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion auth/sample/wear/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.auth.sample"
Expand Down
2 changes: 1 addition & 1 deletion auth/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
12 changes: 12 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion composables/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion compose-layout/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion compose-material/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion compose-tools/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion datalayer/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion datalayer/grpc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion datalayer/phone-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion datalayer/phone/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion ...ne/src/main/java/com/google/android/horologist/datalayer/phone/PhoneDataLayerAppHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion datalayer/sample/phone/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.datalayer.sample"
Expand Down
2 changes: 1 addition & 1 deletion datalayer/sample/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion datalayer/sample/wear/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.horologist.datalayer.sample"
Expand Down
2 changes: 1 addition & 1 deletion datalayer/watch/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
19 changes: 9 additions & 10 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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" }
Expand Down Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion health/composables/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 30
Expand Down
2 changes: 1 addition & 1 deletion health/service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 30
Expand Down
2 changes: 1 addition & 1 deletion images/base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion images/coil/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
2 changes: 1 addition & 1 deletion logo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ plugins {

android {
namespace = "com.google.android.horologist.logo"
compileSdk = 34
compileSdk = 35
}
2 changes: 1 addition & 1 deletion media/audio-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}

android {
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 26
Expand Down
Loading
Loading