Skip to content

Commit 3445059

Browse files
authored
Merge pull request #36 from joreilly/dependency_updates
Kotlin 1.8.20, Compose 1.4.0 and related dependencies
2 parents 3a4a980 + 3ecf26a commit 3445059

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v1
12-
- name: set up JDK 11
12+
- name: set up JDK 17
1313
uses: actions/setup-java@v1
1414
with:
15-
java-version: 11
15+
java-version: 17
1616
- name: Build with Gradle
1717
run: ./gradlew :android-app:assembleDebug

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath("com.android.tools.build:gradle:7.4.0")
10+
classpath("com.android.tools.build:gradle:7.4.2")
1111
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
1212
classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
1313
classpath("com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}")
1414
classpath("com.google.gms:google-services:4.3.15")
15-
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.0-1.0.8")
15+
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.20-1.0.10")
1616
classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:${Versions.kmpNativeCoroutines}")
1717
}
1818
}

buildSrc/src/main/java/Dependencies.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11

22
object Versions {
3-
const val kotlin = "1.8.0"
3+
const val kotlin = "1.8.20"
44
const val kotlinCoroutines = "1.6.4"
55
const val kotlinxSerialization = "1.4.1"
6-
const val ktor = "2.2.2"
7-
const val kotlinxDateTime = "0.4.0"
8-
const val koinCore = "3.3.2"
9-
const val koinAndroid = "3.3.2"
10-
const val koinAndroidCompose = "3.4.1"
6+
const val ktor = "2.2.4"
7+
const val koinCore = "3.4.0"
8+
const val koinAndroid = "3.4.0"
9+
const val koinAndroidCompose = "3.4.3"
10+
1111
const val sqlDelight = "1.5.5"
12+
const val kotlinxDateTime = "0.4.0"
1213
const val multiplatformSettings = "1.0.0"
1314

1415
const val kmpNativeCoroutines = "1.0.0-ALPHA-4"
1516

16-
const val compose = "1.4.0-alpha03"
17-
const val composeCompiler = "1.4.0"
17+
const val compose = "1.4.0"
18+
const val composeCompiler = "1.4.5"
1819
const val navCompose = "2.5.2"
1920
const val accompanist = "0.29.0-alpha"
2021
const val mapsCompose = "2.11.0"

0 commit comments

Comments
 (0)