Skip to content

Commit 382ae8e

Browse files
authored
Merge branch 'master' into renovate/com.diffplug.spotless-6.x
2 parents 6f79bfe + d1d0228 commit 382ae8e

6 files changed

Lines changed: 12 additions & 7 deletions

File tree

ViewModel-SavedState-ktx/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
}
1616

1717
dependencies {
18-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21"
18+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10"
1919
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
2020
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1'
2121
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.android.application' version '8.1.1' apply false
33
id 'com.android.library' version '8.1.1' apply false
44
id "com.diffplug.spotless" version "6.20.0" apply false
5-
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
5+
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
66
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
77
}
88

gradle/wrapper/gradle-wrapper.jar

1.61 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ android {
2929
}
3030

3131
dependencies {
32-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21"
32+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10"
3333
implementation 'androidx.appcompat:appcompat:1.6.1'
3434
implementation 'androidx.activity:activity-ktx:1.7.2'
35-
implementation 'androidx.fragment:fragment-ktx:1.5.7'
35+
implementation 'androidx.fragment:fragment-ktx:1.6.1'
3636
implementation project(':ViewModel-SavedState-ktx')
3737
implementation 'com.wada811.databindingktx:databindingktx:7.0.0'
3838
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

0 commit comments

Comments
 (0)