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
8 changed files with 12 additions and 49 deletions
Showing only changes of commit 9e09d20f5a - Show all commits

View file

@ -3,7 +3,6 @@ plugins {
// in each subproject's classloader
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.kotlinAndroid) apply false
alias(libs.plugins.kotlinJvm) apply false
}

View file

@ -25,7 +25,6 @@ compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-mani
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "coroutines" }
cryptography-bigint = { group = "dev.whyoleg.cryptography", name = "cryptography-bigint", version.ref = "cryptography" }
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
@ -38,6 +37,5 @@ voyager-screenmodel = { group = "cafe.adriel.voyager", name = "voyager-screenmod
[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

View file

@ -0,0 +1,9 @@
plugins {
alias(libs.plugins.kotlinJvm)
}
dependencies {
implementation(libs.cryptography.bigint)
testImplementation(libs.kotlin.test)
}

View file

@ -3,8 +3,9 @@ plugins {
}
dependencies {
implementation(projects.shared.crypto)
implementation(projects.library.crypto)
implementation(libs.coroutines.core)
implementation(libs.cryptography.bigint)
implementation(libs.ktor.client.cio)
implementation(libs.ktor.client.core)

View file

@ -19,6 +19,6 @@ dependencyResolutionManagement {
}
include(":app")
include(":shared:crypto")
include(":library:crypto")
include(":library:preferences")
include(":library:stargate")

View file

@ -1,44 +0,0 @@
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary)
}
kotlin {
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
}
}
}
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
sourceSets {
commonMain.dependencies {
implementation(libs.cryptography.bigint)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
}
}
}
android {
namespace = "net.agorise.shared.crypto"
compileSdk = libs.versions.android.compileSdk.get().toInt()
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}