Skip to content

Commit e91deb0

Browse files
committed
Task: Update Kotlin Multiplatform to 1.7.0 and deps
1 parent 13c196e commit e91deb0

File tree

19 files changed

+2976
-2913
lines changed

19 files changed

+2976
-2913
lines changed

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![CI-MASTER](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml)
2-
[![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.6.11)
3-
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.0.20-blue?logo=kotlin&logoColor=white)
2+
[![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.7.0)
3+
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.0.21-blue?logo=kotlin&logoColor=white)
44
<div align="center">
55
<img alt="Compose multiplatform charts" src="./screenshots/compose_multiplatform_logo.png"/>
66
<h1>🚀 Example project to show SpaceX data built with Kotlin Multiplatform and Compose UI Multiplatform</h1>

app/versions/dependencies/debugAndroidTestRuntimeClasspathDependencies.txt

Lines changed: 133 additions & 133 deletions
Large diffs are not rendered by default.

app/versions/dependencies/debugRuntimeClasspathDependencies.txt

Lines changed: 697 additions & 687 deletions
Large diffs are not rendered by default.

app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt

Lines changed: 697 additions & 687 deletions
Large diffs are not rendered by default.

app/versions/dependencies/releaseRuntimeClasspathDependencies.txt

Lines changed: 691 additions & 681 deletions
Large diffs are not rendered by default.

app/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt

Lines changed: 691 additions & 681 deletions
Large diffs are not rendered by default.
4.2 KB
Binary file not shown.

build-conventions/src/main/kotlin/composeapp.multiplatform-library-conventions.gradle.kts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ import com.jarroyo.composeapp.ext.android
22
import com.jarroyo.composeapp.ext.config
33
import org.gradle.accessors.dm.LibrariesForLibs
44
import org.gradle.kotlin.dsl.the
5+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
6+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
57

68
plugins {
79
kotlin("multiplatform")
810
id("com.android.library")
911
id("kotlin-parcelize")
10-
id ("composeapp.config-conventions")
12+
id("composeapp.config-conventions")
1113
}
1214

1315
val libs = the<LibrariesForLibs>()
@@ -16,16 +18,21 @@ android {
1618
compileSdk = libs.versions.androidCompileSdk.get().toInt()
1719
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
1820
compileOptions {
19-
sourceCompatibility = JavaVersion.VERSION_17
20-
targetCompatibility = JavaVersion.VERSION_17
21+
sourceCompatibility = config.android.javaVersion.get()
22+
targetCompatibility = config.android.javaVersion.get()
2123
}
22-
defaultConfig{
24+
defaultConfig {
2325
minSdk = config.android.minSdk.get()
2426
}
2527
}
2628

2729
kotlin {
28-
androidTarget()
30+
androidTarget {
31+
@OptIn(ExperimentalKotlinGradlePluginApi::class)
32+
compilerOptions {
33+
jvmTarget.set(JvmTarget.fromTarget(config.android.javaVersion.get().toString()))
34+
}
35+
}
2936
listOf(
3037
iosX64(),
3138
iosArm64(),
@@ -74,7 +81,7 @@ kotlin {
7481

7582
val desktopMain by getting {
7683
dependencies {
77-
implementation(libs.coroutines.core)
84+
implementation(libs.coroutines.swing)
7885
implementation(libs.ktor.client.cio)
7986
}
8087
}

0 commit comments

Comments
 (0)