Skip to content

Commit

Permalink
Update sgp to v0.9.16 (#779)
Browse files Browse the repository at this point in the history
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[com.slack.gradle.root](https://github.com/slackhq/slack-gradle-plugin)
| `0.9.14-1.9.0-RC` -> `0.9.16` |
[![age](https://badges.renovateapi.com/packages/maven/com.slack.gradle.root/0.9.16/age-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://badges.renovateapi.com/packages/maven/com.slack.gradle.root/0.9.16/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://badges.renovateapi.com/packages/maven/com.slack.gradle.root/0.9.16/compatibility-slim/0.9.14-1.9.0-RC)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://badges.renovateapi.com/packages/maven/com.slack.gradle.root/0.9.16/confidence-slim/0.9.14-1.9.0-RC)](https://docs.renovatebot.com/merge-confidence/)
|
|
[com.slack.gradle.base](https://github.com/slackhq/slack-gradle-plugin)
| `0.9.14-1.9.0-RC` -> `0.9.16` |
[![age](https://badges.renovateapi.com/packages/maven/com.slack.gradle.base/0.9.16/age-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://badges.renovateapi.com/packages/maven/com.slack.gradle.base/0.9.16/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://badges.renovateapi.com/packages/maven/com.slack.gradle.base/0.9.16/compatibility-slim/0.9.14-1.9.0-RC)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://badges.renovateapi.com/packages/maven/com.slack.gradle.base/0.9.16/confidence-slim/0.9.14-1.9.0-RC)](https://docs.renovatebot.com/merge-confidence/)
|

---

### ⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the
Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>slackhq/slack-gradle-plugin (com.slack.gradle.root)</summary>

###
[`v0.9.16`](https://github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#&#8203;0916)

[Compare
Source](https://github.com/slackhq/slack-gradle-plugin/compare/0.9.15...0.9.16)

*2023-06-30*

-   Enable lint on test sources by default.
-   Account for all version catalogs in `DependencyRake`.
-   Update Guava to `32.1.0-jre`.

###
[`v0.9.15`](https://github.com/slackhq/slack-gradle-plugin/blob/HEAD/CHANGELOG.md#&#8203;0915)

*2023-06-29*

-   Switch Robolectric jar downloads to use detached configurations.
- This lets Gradle do the heavy lifting of caching the downloaded jars
and also allows downloading them from a configured repository setup.
This also simplifies the up-to-date checks.
- Docs are now published on
https://slackhq.github.io/slack-gradle-plugin. This is a work in
progress.
- API kdocs are published at
https://slackhq.github.io/slack-gradle-plugin/api/0.x/.
-   Update `kotlin-cli-util` to 1.2.2.

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/ZacSweers/CatchUp).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xNDQuMiIsInVwZGF0ZWRJblZlciI6IjM1LjE0NC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zac Sweers <pandanomic@gmail.com>
  • Loading branch information
renovate[bot] and ZacSweers authored Jul 1, 2023
1 parent e475822 commit 14407f8
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 16 deletions.
5 changes: 0 additions & 5 deletions app/src/main/kotlin/io/sweers/catchup/home/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import android.content.res.Configuration
import androidx.compose.animation.Animatable
import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.PagerDefaults
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
Expand Down Expand Up @@ -321,9 +319,6 @@ fun Home(state: HomeScreen.State, modifier: Modifier = Modifier) {
key = { state.serviceMetas[it].id },
state = pagerState,
verticalAlignment = Alignment.Top,
// Explicitly defined to cover for https://issuetracker.google.com/issues/264729364
pageNestedScrollConnection =
PagerDefaults.pageNestedScrollConnection(Orientation.Horizontal)
) { page ->
CircuitContent(
screen = ServiceScreen(state.serviceMetas[page].id),
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/kotlin/io/sweers/catchup/ui/about/AboutScreen.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.sweers.catchup.ui.about

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.PagerDefaults
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
Expand Down Expand Up @@ -85,9 +83,6 @@ fun About(state: AboutScreen.State, modifier: Modifier = Modifier) {
key = { it },
state = pagerState,
verticalAlignment = Alignment.Top,
// Explicitly defined to cover for https://issuetracker.google.com/issues/264729364
pageNestedScrollConnection =
PagerDefaults.pageNestedScrollConnection(Orientation.Horizontal)
) { page ->
CircuitContent(SCREENS[page])
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,11 @@ fun OrderServices(state: OrderServicesScreen.State, modifier: Modifier = Modifie
exit = scaleOut(),
) {
val scope = rememberCoroutineScope()
val interactionSource = remember { MutableInteractionSource() }
FloatingActionButton(
modifier =
Modifier.indication(
MutableInteractionSource(),
interactionSource,
indication = rememberRipple(color = Color.White)
),
// TODO show syllabus on fab
Expand Down
9 changes: 8 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ slack.allow-ksp=true
slack.allow-moshi-ir=true
slack.auto-apply.detekt=false
slack.log-thermals=true

# Use Zulu for auto-configured JDK downloads.
sgp.config.jvmVendor=AZUL

# Disable noisy logging about mismatched KSP and Kotlin versions
ksp.version.check=false

Expand All @@ -87,4 +91,7 @@ catchup.mavenUrls.snapshots.sonatypes01=https://s01.oss.sonatype.org/content/rep
catchup.mavenUrls.snapshots.androidx=https://androidx.dev/snapshots/latest/artifacts/repository
catchup.mavenUrls.kotlinDev=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/

android.disableResourceValidation=true
android.disableResourceValidation=true

# SGP: https://github.com/slackhq/slack-gradle-plugin
#systemProp.slack.include-build.sgp=/path/to/slack-gradle-plugin
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ autodispose = "2.1.1"
chuck = "1.1.0"
circuit = "0.10.0"
coil = "2.4.0"
compose = "1.5.0-beta03"
compose = "1.6.0-alpha01"
# Pre-release versions for testing Kotlin previews can be found here
# https://androidx.dev/storage/compose-compiler/repository
compose-compiler = "1.4.7-dev-k1.9.0-Beta-bb7dc8b44eb"
compose-compiler-kotlinVersion = "1.9.0-Beta"
compose-compiler = "1.4.8-dev-k1.9.0-RC-5532d15c918"
compose-compiler-kotlinVersion = "1.9.0-RC"
corbind = "1.8.0"
coroutines = "1.7.2"
crumb = "0.1.0"
Expand All @@ -43,7 +43,7 @@ preferences = "1.2.0"
retrofit = "2.9.0"
room = "2.6.0-alpha02"
sortDependencies = "0.3"
sgp = "0.9.14-1.9.0-RC"
sgp = "0.9.16-1.9.0-RC"
spotless = "6.19.0"
sqldelight = "2.0.0-rc02"
telephoto = "1.0.0-alpha02"
Expand Down
15 changes: 15 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,21 @@ gradleEnterprise {

rootProject.name = "CatchUp"

inline fun configureIncludedBuild(key: String, body: (path: String) -> Unit) {
System.getProperty("slack.include-build.$key")?.let(body)
}

// See comments on systemProp.slack.include-build.sgp property in gradle.properties
configureIncludedBuild("sgp") { path ->
includeBuild(path) {
dependencySubstitution {
substitute(module("com.slack.gradle:sgp")).using(project(":slack-plugin"))
substitute(module("com.slack.gradle:sgp-agp-handler-api"))
.using(project(":agp-handlers:agp-handler-api"))
}
}
}

include(":platform")

// https://docs.gradle.org/5.6/userguide/groovy_plugin.html#sec:groovy_compilation_avoidance
Expand Down

0 comments on commit 14407f8

Please sign in to comment.