Skip to content

Commit 144baaa

Browse files
Coding-MeetCoding-Meet
committed
update all library version
1 parent 79d0ba5 commit 144baaa

File tree

73 files changed

+356
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+356
-294
lines changed

‎composeApp/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
21
import com.codingfeline.buildkonfig.compiler.FieldSpec
2+
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
33
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
55
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
@@ -30,7 +30,7 @@ kotlin {
3030
androidTarget {
3131
tasks.withType<KotlinJvmCompile>().configureEach {
3232
compilerOptions {
33-
jvmTarget.set(JvmTarget.JVM_1_8)
33+
jvmTarget.set(JvmTarget.JVM_11)
3434
}
3535
}
3636
}
@@ -187,8 +187,8 @@ android {
187187
}
188188
}
189189
compileOptions {
190-
sourceCompatibility = JavaVersion.VERSION_1_8
191-
targetCompatibility = JavaVersion.VERSION_1_8
190+
sourceCompatibility = JavaVersion.VERSION_11
191+
targetCompatibility = JavaVersion.VERSION_11
192192
}
193193
}
194194

‎composeApp/src/JsMain/kotlin/di/DatabaseDriverFactory.kt renamed to ‎composeApp/src/JsMain/kotlin/com/coding/meet/gaminiaikmp/di/DatabaseDriverFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package di
1+
package com.coding.meet.gaminiaikmp.di
22

33
import app.cash.sqldelight.async.coroutines.awaitCreate
44
import app.cash.sqldelight.db.SqlDriver

‎composeApp/src/JsMain/kotlin/di/Platform.js.kt renamed to ‎composeApp/src/JsMain/kotlin/com/coding/meet/gaminiaikmp/di/Platform.js.kt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
1-
package di
1+
package com.coding.meet.gaminiaikmp.di
22

33
import androidx.compose.foundation.layout.padding
44
import androidx.compose.material3.MaterialTheme
55
import androidx.compose.material3.Text
6-
import androidx.compose.runtime.*
6+
import androidx.compose.runtime.Composable
7+
import androidx.compose.runtime.rememberCoroutineScope
78
import androidx.compose.ui.Modifier
89
import androidx.compose.ui.graphics.ImageBitmap
910
import androidx.compose.ui.graphics.toComposeImageBitmap
1011
import androidx.compose.ui.platform.ClipboardManager
1112
import androidx.compose.ui.text.font.FontFamily
1213
import androidx.compose.ui.unit.dp
13-
import domain.model.ChatMessage
14-
import domain.model.Group
14+
import com.coding.meet.gaminiaikmp.domain.model.ChatMessage
15+
import com.coding.meet.gaminiaikmp.domain.model.Group
16+
import com.coding.meet.gaminiaikmp.theme.whiteColor
17+
import com.coding.meet.gaminiaikmp.utils.AppCoroutineDispatchers
18+
import com.coding.meet.gaminiaikmp.utils.TYPE
1519
import io.github.xxfast.kstore.KStore
1620
import io.github.xxfast.kstore.storage.storeOf
1721
import kotlinx.browser.document
1822
import kotlinx.browser.window
19-
import kotlinx.coroutines.*
23+
import kotlinx.coroutines.CoroutineDispatcher
24+
import kotlinx.coroutines.Dispatchers
25+
import kotlinx.coroutines.launch
2026
import org.jetbrains.skia.Image
2127
import org.khronos.webgl.ArrayBuffer
2228
import org.khronos.webgl.Uint8Array
2329
import org.khronos.webgl.get
2430
import org.w3c.dom.HTMLInputElement
2531
import org.w3c.files.FileReader
2632
import org.w3c.files.get
27-
import theme.whiteColor
28-
import utils.AppCoroutineDispatchers
29-
import utils.TYPE
3033
import kotlin.coroutines.resume
3134
import kotlin.coroutines.resumeWithException
3235
import kotlin.coroutines.suspendCoroutine

‎composeApp/src/JsMain/kotlin/main.kt renamed to ‎composeApp/src/JsMain/kotlin/com/coding/meet/main.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
package com.coding.meet
2+
13
import androidx.compose.ui.ExperimentalComposeUiApi
24
import androidx.compose.ui.window.CanvasBasedWindow
3-
import di.initKoin
5+
import com.coding.meet.gaminiaikmp.App
6+
import com.coding.meet.gaminiaikmp.di.initKoin
47
import org.jetbrains.skiko.wasm.onWasmReady
58
import org.koin.compose.koinInject
69

‎composeApp/src/androidMain/kotlin/com/coding/meet/gaminiaikmp/MainActivity.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.coding.meet.gaminiaikmp
22

3-
import App
43
import android.os.Bundle
54
import androidx.activity.ComponentActivity
65
import androidx.activity.OnBackPressedCallback
76
import androidx.activity.compose.setContent
87
import androidx.compose.ui.graphics.toArgb
98
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
9+
import com.coding.meet.gaminiaikmp.presentation.screens.mainscreen.MainViewModel
10+
import com.coding.meet.gaminiaikmp.theme.borderColor
11+
import com.coding.meet.gaminiaikmp.utils.Screens
1012
import org.koin.compose.koinInject
11-
import utils.Screens
12-
import presentation.screens.mainscreen.MainViewModel
13-
import theme.borderColor
1413

1514
class MainActivity : ComponentActivity() {
1615

‎composeApp/src/androidMain/kotlin/com/coding/meet/gaminiaikmp/MainApplication.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.coding.meet.gaminiaikmp
22

33
import android.app.Application
4-
import di.*
4+
import com.coding.meet.gaminiaikmp.di.initKoin
55
import org.koin.android.ext.koin.androidContext
6-
import org.koin.core.context.startKoin
76

87
class MainApplication: Application() {
98

‎composeApp/src/androidMain/kotlin/di/DatabaseDriverFactory.kt renamed to ‎composeApp/src/androidMain/kotlin/com/coding/meet/gaminiaikmp/di/DatabaseDriverFactory.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
package di
1+
package com.coding.meet.gaminiaikmp.di
22

33
import app.cash.sqldelight.async.coroutines.synchronous
44
import app.cash.sqldelight.db.SqlDriver
55
import app.cash.sqldelight.driver.android.AndroidSqliteDriver
66
import com.coding.meet.gaminiaikmp.GeminiApiChatDB
7+
import com.coding.meet.gaminiaikmp.utils.DB_NAME
78
import org.koin.mp.KoinPlatform
89

910
actual class DatabaseDriverFactory {
1011
actual suspend fun createDriver(): SqlDriver {
1112
return AndroidSqliteDriver(
1213
GeminiApiChatDB.Schema.synchronous(),
1314
KoinPlatform.getKoin().get(),
14-
"GeminiApiChatDB.db"
15+
DB_NAME
1516
)
1617
}
1718
}

‎composeApp/src/androidMain/kotlin/di/Platform.android.kt renamed to ‎composeApp/src/androidMain/kotlin/com/coding/meet/gaminiaikmp/di/Platform.android.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package di
1+
package com.coding.meet.gaminiaikmp.di
22

33
import android.content.Context
44
import android.graphics.BitmapFactory
@@ -13,15 +13,15 @@ import androidx.compose.ui.graphics.asImageBitmap
1313
import androidx.compose.ui.platform.ClipboardManager
1414
import androidx.compose.ui.platform.LocalContext
1515
import androidx.compose.ui.text.AnnotatedString
16-
import domain.model.ChatMessage
17-
import domain.model.Group
16+
import com.coding.meet.gaminiaikmp.domain.model.ChatMessage
17+
import com.coding.meet.gaminiaikmp.domain.model.Group
18+
import com.coding.meet.gaminiaikmp.presentation.components.CommonTextComposable
19+
import com.coding.meet.gaminiaikmp.utils.AppCoroutineDispatchers
20+
import com.coding.meet.gaminiaikmp.utils.TYPE
1821
import io.github.xxfast.kstore.KStore
1922
import kotlinx.coroutines.CoroutineDispatcher
2023
import kotlinx.coroutines.Dispatchers
2124
import org.koin.mp.KoinPlatform
22-
import presentation.components.CommonTextComposable
23-
import utils.AppCoroutineDispatchers
24-
import utils.TYPE
2525

2626
actual fun getPlatform(): TYPE = TYPE.MOBILE
2727

‎composeApp/src/commonMain/kotlin/App.kt renamed to ‎composeApp/src/commonMain/kotlin/com/coding/meet/gaminiaikmp/App.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
package com.coding.meet.gaminiaikmp
2+
13
import androidx.compose.material.MaterialTheme
24
import androidx.compose.runtime.Composable
3-
import presentation.screens.mainscreen.*
5+
import com.coding.meet.gaminiaikmp.presentation.screens.mainscreen.MainScreen
6+
import com.coding.meet.gaminiaikmp.presentation.screens.mainscreen.MainViewModel
47

58
@Composable
69
fun App(mainViewModel: MainViewModel) {

‎composeApp/src/commonMain/kotlin/data/database/SharedDatabase.kt renamed to ‎composeApp/src/commonMain/kotlin/com/coding/meet/gaminiaikmp/data/database/SharedDatabase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package data.database
1+
package com.coding.meet.gaminiaikmp.data.database
22

33
import app.cash.sqldelight.ColumnAdapter
44
import com.coding.meet.gaminiaikmp.GeminiApiChatDB
55
import com.coding.meet.gaminiaikmp.Message
6-
import di.DatabaseDriverFactory
7-
import domain.model.Role
6+
import com.coding.meet.gaminiaikmp.di.DatabaseDriverFactory
7+
import com.coding.meet.gaminiaikmp.domain.model.Role
88
import kotlin.io.encoding.Base64
99
import kotlin.io.encoding.ExperimentalEncodingApi
1010

0 commit comments

Comments
 (0)