Convert to Android-only project #1

Merged
Ghost merged 6 commits from convert-to-android-project into main 2024-04-29 22:37:45 +00:00
17 changed files with 14 additions and 60 deletions
Showing only changes of commit f5973b1b01 - Show all commits

View file

@ -1,24 +0,0 @@
// Project generated by Kotlin Multiplatform Wizard
{
"spec": {
"template_id": "kmt",
"targets": {
"android": {
"ui": [
"compose"
]
},
"ios": {
"ui": [
"compose"
]
},
"desktop": {
"ui": [
"compose"
]
}
}
},
"timestamp": "2024-03-04T14:16:27.193356112Z"
}

View file

@ -1,5 +0,0 @@
{
"configurations": [
]
}

View file

@ -1,3 +0,0 @@
{
"run.destination.stop.already.running": "Always"
}

View file

@ -1,6 +1,6 @@
plugins { plugins {
alias(libs.plugins.androidApplication) alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid) alias(libs.plugins.kotlinAndroid)
} }
android { android {
@ -50,7 +50,7 @@ android {
} }
dependencies { dependencies {
implementation(projects.shared.preferences) implementation(projects.library.preferences)
implementation(projects.shared.stargate) implementation(projects.shared.stargate)
implementation(platform(libs.compose.bom)) implementation(platform(libs.compose.bom))

View file

@ -5,5 +5,5 @@ plugins {
alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.jetbrainsCompose) apply false alias(libs.plugins.jetbrainsCompose) apply false
alias(libs.plugins.kotlinMultiplatform) apply false alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.jetbrainsKotlinAndroid) apply false alias(libs.plugins.kotlinAndroid) apply false
} }

View file

@ -42,4 +42,4 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" }
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" } jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

View file

@ -1,28 +1,6 @@
plugins { plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary) alias(libs.plugins.androidLibrary)
} alias(libs.plugins.kotlinAndroid)
kotlin {
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
}
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
sourceSets {
commonMain.dependencies {
implementation(libs.multiplatform.settings)
}
}
} }
android { android {
@ -37,4 +15,12 @@ android {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11
} }
kotlinOptions {
jvmTarget = "11"
}
}
dependencies {
implementation(libs.multiplatform.settings)
} }

View file

@ -20,5 +20,5 @@ dependencyResolutionManagement {
include(":app") include(":app")
include(":shared:crypto") include(":shared:crypto")
include(":shared:preferences") include(":library:preferences")
include(":shared:stargate") include(":shared:stargate")