Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/upstream' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed May 25, 2024
2 parents cdfa3fd + 3ffaf14 commit 4f99bef
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
5 changes: 2 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
],
"packageRules": [
{
"groupName": "Kotlin, KSP and Compose Compiler",
"groupName": "Kotlin and KSP",
"matchPackagePrefixes": [
"com.google.devtools.ksp",
"androidx.compose.compiler"
"com.google.devtools.ksp"
],
"matchPackagePatterns": [
"org.jetbrains.kotlin.*"
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ plugins {
id 'com.android.library' version "8.4.1" apply false
id 'com.android.test' version '8.4.1' apply false
id 'androidx.baselineprofile' version '1.2.4'
id 'org.jetbrains.kotlin.android' version "2.0.0-RC3"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0-RC3"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0-RC3"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0-RC3"
id "com.google.devtools.ksp" version "2.0.0-RC3-1.0.20"
id 'org.jetbrains.kotlin.android' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0"
id "com.google.devtools.ksp" version "2.0.0-1.0.21"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.11.0"
id 'dev.rikka.tools.refine' version "4.4.0"
Expand Down Expand Up @@ -42,7 +42,7 @@ allprojects {
}

plugins.withId('com.google.protobuf') {
def protocVersion = '4.26.1'
def protocVersion = '4.27.0'
protobuf {
// Configure the protoc executable
protoc {
Expand Down Expand Up @@ -388,7 +388,7 @@ dependencies {
implementation 'com.airbnb.android:lottie:6.4.0'

// Smartspacer
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.9') {
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.10') {
exclude group: "com.github.skydoves", module: "balloon"
}
}
Expand Down

0 comments on commit 4f99bef

Please sign in to comment.