InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-11-25 19:48:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

trying to update to new compose

Browse Source
This commit is contained in:
InsanusMokrassar 2024-05-24 15:50:26 +06:00
parent 17d6377902
commit a0dd1aec3d
12 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
.idea
.kotlin
out/*
*.iml
target

1
android/pickers/build.gradle
View File

@ -3,6 +3,7 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
alias(libs.plugins.jb.compose)
alias(libs.plugins.kt.jb.compose)
}
apply from: "$mppProjectWithSerializationAndComposePresetPath"

1
android/smalltextfield/build.gradle
View File

@ -3,6 +3,7 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
alias(libs.plugins.jb.compose)
alias(libs.plugins.kt.jb.compose)
}
apply from: "$mppProjectWithSerializationAndComposePresetPath"

1
common/compose/build.gradle
View File

@ -3,6 +3,7 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
alias(libs.plugins.jb.compose)
alias(libs.plugins.kt.jb.compose)
}
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

1
coroutines/compose/build.gradle
View File

@ -3,6 +3,7 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
alias(libs.plugins.jb.compose)
alias(libs.plugins.kt.jb.compose)
}
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

1
defaultAndroidSettings.gradle
View File

@ -6,6 +6,7 @@ android {
defaultConfig {
minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
versionCode "${android_code_version}".toInteger()
versionName "$version"

5
gradle/libs.versions.toml
View File

@ -1,12 +1,12 @@
[versions]
kt = "1.9.23"
kt = "2.0.0"
kt-serialization = "1.6.3"
kt-coroutines = "1.8.1"
kslog = "1.3.4"
jb-compose = "1.6.2"
jb-compose = "1.6.10"
jb-exposed = "0.50.1"
jb-dokka = "1.9.20"
@ -113,5 +113,6 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra
[plugins]
jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }
kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" }
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

1
mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle
View File

@ -57,7 +57,6 @@ kotlin {
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
}
}
nativeMain.dependsOn commonMain

1
mppJvmJsAndroidProject.gradle
View File

@ -48,7 +48,6 @@ kotlin {
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
}
}
androidUnitTest {

1
mppJvmJsLinuxMingwLinuxArm64Project.gradle
View File

@ -42,7 +42,6 @@ kotlin {
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
}
}

1
mppJvmJsLinuxMingwProject.gradle
View File

@ -41,7 +41,6 @@ kotlin {
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
}
}
mingwX64Test {

8
mppProjectWithSerializationAndCompose.gradle
View File

@ -58,7 +58,6 @@ kotlin {
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
}
}
androidUnitTest {
@ -69,13 +68,6 @@ kotlin {
implementation compose.uiTest
}
}
androidInstrumentedTest {
dependencies {
implementation kotlin('test-junit')
implementation libs.android.test.junit
implementation libs.android.espresso
}
}
}
}