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.

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

Bump to Kotlin 1.9.10 #1743

Merged
merged 5 commits into from
Oct 9, 2023
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions auth/sample/wear/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -137,15 +137,6 @@ dependencies {
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.robolectric)

constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10") {
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10") {
because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
}
}
}

secrets {
17 changes: 0 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -45,8 +45,6 @@ buildscript {
plugins {
alias(libs.plugins.spotless)
alias(libs.plugins.kotlinGradle) apply false
alias(libs.plugins.benManes)
alias(libs.plugins.versionCatalogUpdate)
alias(libs.plugins.ksp) apply false
alias(libs.plugins.protobuf) apply false
alias(libs.plugins.gradleMavenPublishPlugin)
@@ -295,19 +293,4 @@ subprojects {
}
}
}
}

tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
rejectVersionIf {
(candidate.version.matches(".*-alpha.*".toRegex()) && !(currentVersion.matches(".*-alpha.*".toRegex()))) ||
(candidate.version.matches(".*-beta.*".toRegex()) && !(currentVersion.matches(".*-(beta|alpha).*".toRegex())))
}
}

apply(plugin = "nl.littlerobots.version-catalog-update")

versionCatalogUpdate {
keep {
keepUnusedVersions.set(true)
}
}
2 changes: 1 addition & 1 deletion datalayer/core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ dependencies {
api(libs.androidx.datastore)
api(libs.protobuf.kotlin.lite)
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.androidx.wear.remote.interactions)
api(libs.androidx.wear.remote.interactions)
implementation(libs.androidx.lifecycle.service)

testImplementation(libs.junit)
Original file line number Diff line number Diff line change
@@ -55,11 +55,12 @@ abstract class DataLayerAppHelper(
protected val context: Context,
protected val registry: WearDataLayerRegistry,
) {
private val installedDeviceCapabilityUri = "wear://*/$CAPABILITY_DEVICE_PREFIX"
private val activityManager by lazy { context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager }
private val installedDeviceCapabilityUri: String = "wear://*/$CAPABILITY_DEVICE_PREFIX"

protected val playStoreUri = "market://details?id=${context.packageName}"
protected val remoteActivityHelper by lazy { RemoteActivityHelper(context) }
private val activityManager: ActivityManager by lazy { context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager }

protected val playStoreUri: String = "market://details?id=${context.packageName}"
protected val remoteActivityHelper: RemoteActivityHelper by lazy { RemoteActivityHelper(context) }

/**
* Provides a list of connected nodes and the installation status of the app on these nodes.
@@ -107,12 +108,12 @@ abstract class DataLayerAppHelper(
trySend(capability.nodes.filter { it.isNearby }.toSet())
}

val allCaps =
registry.capabilityClient.getAllCapabilities(
CapabilityClient.FILTER_REACHABLE,
).await()
val installedCaps = allCaps.filter { it.key.startsWith(CAPABILITY_DEVICE_PREFIX) }
.values.flatMap { it.nodes }.filter { it.isNearby }.toSet()
val allCaps = registry.capabilityClient.getAllCapabilities(
CapabilityClient.FILTER_REACHABLE,
).await()
val installedCaps =
allCaps.filter { it.key.startsWith(CAPABILITY_DEVICE_PREFIX) }.values.flatMap { it.nodes }
.filter { it.isNearby }.toSet()

@Suppress("UNUSED_VARIABLE")
val unused = trySend(installedCaps)
14 changes: 4 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -27,11 +27,10 @@ androidxprotolayout = "1.0.0"
androidxtiles = "1.2.0"
annotation = "1.0.1"
app-cash-turbine = "1.0.0"
benManes = "0.49.0"
com-squareup-okhttp3 = "4.11.0"
com-squareup-retrofit2 = "2.9.0"
compose = "1.5.3"
compose-compiler = "1.4.8"
compose = "1.6.0-alpha07"
compose-compiler = "1.5.3"
composesnapshot = "-"
dependencyAnalysis = "1.20.0"
dokka = "1.9.0"
@@ -41,9 +40,9 @@ gradlePlugin = "8.1.2"
gradlePublishPlugin = "0.25.3"
io-coil-kt = "2.4.0"
junit = "4.13.2"
kotlin = "1.8.22"
kotlin = "1.9.10"
kotlinxCoroutine = "1.7.3"
ksp = "1.8.22-1.0.11"
ksp = "1.9.10-1.0.13"
ktlint = "0.50.0"
metalava = "0.3.3"
moshi = "1.15.0"
@@ -55,10 +54,7 @@ room = "2.5.2"
runtimeTracing = "1.0.0-alpha04"
snapshot-android = "1.0.4"
spotless = "6.22.0"
tracingPerfetto = "1.0"
tracingPerfettoBinary = "1.0"
truth = "1.1.5"
versionCatalogUpdate = "0.8.1"
wearcompose = "1.3.0-alpha07"
wearToolingPreview = "1.0.0-alpha01"

@@ -202,12 +198,10 @@ wearcompose-navigation = { module = "androidx.wear.compose:compose-navigation",
wearcompose-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wearcompose" }

[plugins]
benManes = { id = "com.github.ben-manes.versions", version.ref = "benManes" }
dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
gradleMavenPublishPlugin = { id = "com.vanniktech.maven.publish", version.ref = "gradlePublishPlugin" }
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
kotlinGradle = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
protobuf = "com.google.protobuf:0.9.4"
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdate" }
9 changes: 0 additions & 9 deletions media/sample/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -272,15 +272,6 @@ dependencies {
androidTestImplementation(libs.androidx.complications.rendering)
androidTestImplementation(libs.dagger.hiltandroidtesting)
kspAndroidTest(libs.dagger.hiltandroidcompiler)

constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10") {
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10") {
because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
}
}
}

val device: String? = localProperties.getProperty("DEVICE")
9 changes: 0 additions & 9 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -199,15 +199,6 @@ dependencies {
androidTestImplementation(libs.junit)
androidTestImplementation(libs.androidx.test.ext)
androidTestImplementation(libs.androidx.test.ext.ktx)

constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
}
}
}

tasks.maybeCreate("prepareKotlinIdeaImport")