Skip to content

Commit 78921a9

Browse files
ferranponsferranpons
authored
Upgraded to Compose Multiplatform 1.6.0 (#10)
* Upgraded to Compose Multiplatform 1.6.0 Beta2 * changed branch name * updated Compose Multiplatform to final 1.6.0 version * ktlint issue * ktlint issues * ktlint filter generated path files * added missing configurations for Fleet
1 parent 9d01a0c commit 78921a9

File tree

20 files changed

+98
-55
lines changed

20 files changed

+98
-55
lines changed

‎.fleet/run.json‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"type": "android-app",
55
"name": "Android-app configuration",
6-
"module": "My_Project_Name.androidApp.main",
6+
"module": "MultiplatformKickstarter.androidApp.main",
77
"destination": "Pixel 7 API 33",
88
},
99
{
@@ -14,7 +14,31 @@
1414
"target": "iosApp",
1515
},
1616
"configuration": "Debug",
17-
"destination": "iPhone 15 | iOS 17.0",
17+
"destination": "iPhone 15 Pro | iOS 17.2",
18+
},
19+
{
20+
"name": "desktopApp [Jvm]",
21+
"type": "jps-run",
22+
"workingDir": "$PROJECT_DIR$",
23+
"mainClass": "MainKt",
24+
"module": "MultiplatformKickstarter.desktopApp.jvmMain",
25+
"options": ["-Djava.library.path=$PROJECT_DIR$/desktopApp/build/classes/kotlin/jvm/main:$PROJECT_DIR$/shared/build/classes/kotlin/jvm/main:$PROJECT_DIR$/shared/build/processedResources/jvm/main", "-Dfile.encoding=UTF-8", "-Dsun.stdout.encoding=UTF-8", "-Dsun.stderr.encoding=UTF-8"]
26+
},
27+
{
28+
"name": "Server",
29+
"type": "gradle",
30+
"workingDir": "$PROJECT_DIR$",
31+
"environment": {
32+
"JDBC_DATABASE_URL": "jdbc:postgresql:habits?user=postgres",
33+
"JWT_SECRET": "898748674728934843",
34+
"SECRET_KEY": "898748674728934843",
35+
"JDBC_DRIVER": "org.postgresql.Driver"
36+
},
37+
"tasks": ["run"],
38+
"args": ["--info", "-p", "$PROJECT_DIR$/backend"],
39+
"initScripts": {
40+
"flmapper": "ext.mapPath = { path -> null }"
41+
}
1842
}
1943
]
2044
}

‎.github/workflows/basic.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Basic CI
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: [ "master" ]
66
pull_request:
7-
branches: [ "main" ]
7+
branches: [ "master" ]
88

99
jobs:
1010
build:

‎README.md‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
Author: Multiplatform Kickstarter
55
-->
66

7-
[![Build](https://github.com/multiplatformkickstarter/kmp-template/actions/workflows/basic.yml/badge.svg)](https://github.com/multiplatformkickstarter/kmp-template/actions/workflows/basic.yml)
8-
[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.21-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
7+
[![Build](https://github.com/MultiplatformKickstarter/Adoptme/actions/workflows/basic.yml/badge.svg)](https://github.com/multiplatformkickstarter/Adoptme/actions/workflows/basic.yml)
8+
[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.22-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
99
![badge-android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat)
1010
![badge-ios](http://img.shields.io/badge/platform-ios-6EDB8D.svg?style=flat)
1111
![badge-desktop](http://img.shields.io/badge/platform-desktop-6EDB8D.svg?style=flat)
12+
![badge-ktor](http://img.shields.io/badge/platform-ktor-6EDB8D.svg?style=flat)
1213

1314
<img src="config/images/multiplatform-kickstarter-logo.png" align="left" height="128px" />
1415
<img align="left" width="0" height="128px" hspace="10" />
@@ -139,14 +140,20 @@ Who made this
139140
Contribute
140141
----------
141142

142-
For now, we are not open for contribution until the preview is over.
143+
1. Create an issue to discuss about your idea
144+
2. [Fork it] (https://github.com/MultiplatformKickstarter/Adoptme/fork)
145+
3. Create your feature branch (`git checkout -b my-new-feature`)
146+
4. Commit your changes (`git commit -am 'Add some feature'`)
147+
5. Push to the branch (`git push origin my-new-feature`)
148+
6. Create a new Pull Request
149+
7. Profit! :white_check_mark:
143150
<br><br>
144151

145152

146153
Bugs and Feedback
147154
-----------------
148155

149-
For bugs, questions and discussions please use the [Github Issues](https://github.com/multiplatformkickstarter/kmp-template/issues).
156+
For bugs, questions and discussions please use the [Github Issues](https://github.com/multiplatformkickstarter/Adoptme/issues).
150157
<br><br>
151158

152159

@@ -164,7 +171,7 @@ Check out our social media to be up-to-date about new products, features and rel
164171
License
165172
-------
166173

167-
Copyright 2023 Multiplatform Kickstarter
174+
Copyright 2023-2024 Multiplatform Kickstarter
168175

169176
Licensed under the Apache License, Version 2.0 (the "License");
170177
you may not use this file except in compliance with the License.

‎build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,14 @@ subprojects {
1616

1717
configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
1818
debug.set(true)
19+
filter {
20+
exclude { element ->
21+
element.file.path.contains("generated")
22+
}
23+
}
1924
}
2025

26+
2127
configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
2228
parallel = false
2329
config.setFrom("../config/detekt-config.yml")

‎desktopApp/.run/desktopApp.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="desktopApp" type="JetRunConfigurationType">
33
<option name="MAIN_CLASS_NAME" value="MainKt" />
4-
<module name="Multiplatform_Kickstarter.desktopApp.jvmMain" />
4+
<module name="MultiplatformKickstarter.desktopApp.jvmMain" />
55
<shortenClasspath name="NONE" />
66
<method v="2">
77
<option name="Make" enabled="true" />

‎gradle/libs.versions.toml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
[versions]
2-
kotlin = "1.9.21"
3-
ktor-client = "2.3.7"
4-
ktor-server = "2.3.7"
2+
kotlin = "1.9.22"
3+
ktor-client = "2.3.8"
4+
ktor-server = "2.3.8"
55
multiplatform-settings = "1.0.0"
66
voyager = "1.0.0"
7-
koin = "3.5.0"
8-
koin-compose = "1.1.0"
7+
koin = "3.5.3"
8+
koin-compose = "1.1.2"
99
junit = "4.13.2"
10-
androidGradlePlugin = "8.2.1"
11-
composeMultiplatform = "1.5.11"
12-
compose-compiler = "1.5.6-dev-k1.9.21-3eed341308a"
10+
androidGradlePlugin = "8.2.2"
11+
composeMultiplatform = "1.6.0"
12+
compose-compiler = "1.5.8-dev-k1.9.22-42b6ec2b037"
1313
exposed = "0.37.3"
14-
skiko = "0.7.89.1"
14+
skiko = "0.7.93"
1515
ktlint = "11.5.1"
1616
detekt = "1.23.1"
17-
kotlinx-coroutines = "1.7.3"
17+
kotlinx-coroutines = "1.8.0"
1818
androidx-junit = "1.1.5"
1919
espressoCore = "3.5.1"
2020
accompanistSystemuicontroller = "0.32.0"
2121
activityCompose = "1.8.2"
22-
firebase = "32.7.0"
22+
firebase = "32.7.2"
23+
touchlab = "2.0.5"
2324

2425
[libraries]
2526
# Common
@@ -37,8 +38,8 @@ ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor-client"
3738
kamel = "media.kamel:kamel-image:0.7.1"
3839
kermit = "co.touchlab:kermit:2.0.0-RC5"
3940

40-
kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
41-
kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
41+
kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
42+
kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.5.0"
4243
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
4344
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
4445

@@ -52,7 +53,7 @@ koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
5253
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
5354

5455
# Android
55-
compose-bom = "androidx.compose:compose-bom:2023.10.01"
56+
compose-bom = "androidx.compose:compose-bom:2024.02.01"
5657
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
5758

5859
androidx-core-ktx = "androidx.core:core-ktx:1.12.0"
@@ -67,12 +68,13 @@ androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", vers
6768
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
6869

6970
# iOS
71+
stately-common = { module = "co.touchlab:stately-common", version.ref = "touchlab" }
7072

7173
# Desktop
7274
koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin-compose" }
73-
kotlinx-coroutines-swingui = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.3"
75+
kotlinx-coroutines-swingui = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0"
7476
ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor-client" }
75-
androidx-compose-ui-util = "androidx.compose.ui:ui-util:1.6.0-beta03"
77+
androidx-compose-ui-util = "androidx.compose.ui:ui-util:1.6.2"
7678

7779
# Backend
7880
ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor-server" }

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencyResolutionManagement {
2020
}
2121
}
2222

23-
rootProject.name = "Multiplatform Kickstarter"
23+
rootProject.name = "MultiplatformKickstarter"
2424
include(":androidApp")
2525
include(":shared")
2626
include(":desktopApp")

‎shared/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ kotlin {
7777

7878
iosMain.dependencies {
7979
implementation(libs.ktor.client.darwin)
80+
implementation(libs.stately.common)
8081
}
8182

8283
jvmMain.dependencies {
8384
implementation(compose.desktop.common)
84-
8585
}
8686

8787
commonTest.dependencies {

‎shared/src/commonMain/kotlin/com/multiplatformkickstarter/app/feature/debugmenu/DebugMenuScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ import cafe.adriel.voyager.navigator.currentOrThrow
5151
import com.multiplatformkickstarter.app.feature.debugmenu.viewmodel.DebugMenuSideEffects
5252
import com.multiplatformkickstarter.app.feature.debugmenu.viewmodel.DebugMenuViewModel
5353
import com.multiplatformkickstarter.app.localization.AvailableLanguages
54+
import com.multiplatformkickstarter.app.localization.SetLanguage
5455
import com.multiplatformkickstarter.app.localization.getCurrentLanguage
5556
import com.multiplatformkickstarter.app.localization.getCurrentLocalization
56-
import com.multiplatformkickstarter.app.localization.SetLanguage
5757
import com.multiplatformkickstarter.app.platform.Environment
5858
import com.multiplatformkickstarter.app.platform.ServerEnvironment
5959
import com.multiplatformkickstarter.app.ui.components.ColoredSnackBarHost

‎shared/src/commonMain/kotlin/com/multiplatformkickstarter/app/feature/loginsignup/LoginSignUpLandingScreen.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import com.multiplatformkickstarter.app.localization.getCurrentLocalization
3737
import com.multiplatformkickstarter.app.platform.Resources
3838
import com.multiplatformkickstarter.app.ui.theme.MultiplatformKickstarterTheme
3939
import com.multiplatformkickstarter.app.ui.theme.Typography
40+
import org.jetbrains.compose.resources.DrawableResource
4041
import org.jetbrains.compose.resources.ExperimentalResourceApi
4142
import org.jetbrains.compose.resources.painterResource
4243

@@ -75,7 +76,7 @@ fun LoginSignUpView() {
7576
horizontalAlignment = Alignment.CenterHorizontally
7677
) {
7778
Image(
78-
painterResource(Resources.Drawables.catAndDog),
79+
painterResource(DrawableResource(Resources.Drawables.catAndDog)),
7980
contentDescription = "",
8081
modifier = Modifier.size(150.dp)
8182
)

0 commit comments

Comments
 (0)