Skip to content

Commit 8b5e8c7

Browse files
Bump kotlinVersion from 2.1.10 to 2.2.0 (#1285)
* Bump kotlinVersion from 2.1.10 to 2.2.0 Bumps `kotlinVersion` from 2.1.10 to 2.2.0. Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.1.10 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.2.0) Updates `org.jetbrains.kotlin.android` from 2.1.10 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.2.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.1.10 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.2.0) Updates `org.jetbrains.kotlin.plugin.parcelize` from 2.1.10 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.2.0) Updates `org.jetbrains.kotlin.plugin.compose` from 2.1.10 to 2.2.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.2.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.android dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Updated a bunch of Kotlin/gradle related dependencies together * Updated hilt version as well * kotlin jvm toolchain version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
1 parent 115d55d commit 8b5e8c7

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ val getGitHash = providers
4444
.asText
4545
.map { it.trim() }
4646

47+
kotlin {
48+
compilerOptions {
49+
jvmToolchain(17)
50+
}
51+
}
52+
4753
android {
4854
namespace = "network.loki.messenger"
4955
useLibrary("org.apache.http.legacy")
@@ -53,10 +59,6 @@ android {
5359
targetCompatibility = JavaVersion.VERSION_17
5460
}
5561

56-
kotlinOptions {
57-
jvmTarget = "17"
58-
}
59-
6062
packaging {
6163
resources.excludes += listOf(
6264
"LICENSE.txt", "LICENSE", "NOTICE", "asm-license.txt",

content-descriptions/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ android {
2828
sourceCompatibility = JavaVersion.VERSION_11
2929
targetCompatibility = JavaVersion.VERSION_11
3030
}
31-
32-
kotlinOptions {
33-
jvmTarget = "11"
34-
}
3531
}
3632

3733
dependencies {

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ exifinterfaceVersion = "1.3.4"
2626
firebaseMessagingVersion = "24.0.0"
2727
flexboxVersion = "3.0.0"
2828
fragmentKtxVersion = "1.8.6"
29-
gradlePluginVersion = "8.10.1"
29+
gradlePluginVersion = "8.11.0"
3030
dependenciesAnalysisVersion = "2.17.0"
3131
googleServicesVersion = "4.4.2"
3232
junit = "1.1.5"
33-
kotlinVersion = "2.1.10"
33+
kotlinVersion = "2.2.0"
3434
kotlinxDatetimeVersion = "0.6.0"
3535
kryoVersion = "5.1.1"
36-
kspVersion = "2.1.10-1.0.31"
36+
kspVersion = "2.2.0-2.0.2"
3737
legacySupportV13Version = "1.0.0"
3838
libsessionUtilAndroidVersion = "1.0.5-2-gae785f1"
3939
media3ExoplayerVersion = "1.7.1"
@@ -42,7 +42,7 @@ navVersion = "2.9.0"
4242
appcompatVersion = "1.7.1"
4343
coreVersion = "1.16.0-rc01"
4444
coroutinesVersion = "1.9.0"
45-
daggerHiltVersion = "2.55"
45+
daggerHiltVersion = "2.56.2"
4646
androidxHiltVersion = "1.2.0"
4747
glideVersion = "4.16.0"
4848
jacksonDatabindVersion = "2.9.8"

0 commit comments

Comments
 (0)