kscience/maps-kt
8
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases 1 Wiki Activity

0.1.0 release with Kotlin 1.7.20

Browse Source
This commit is contained in:
Alexander Nozik 2022-10-12 15:03:02 +03:00
parent 5ab7862660
commit e7cb006a3c
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -6,11 +6,13 @@ plugins {
id("space.kscience.gradle.project") id("space.kscience.gradle.project")
} }
val ktorVersion by extra("2.0.3")
allprojects { allprojects {
group = "center.sciprog" group = "center.sciprog"
version = "0.1.0-dev-13" version = "0.1.0"
}
apiValidation{
validationDisabled = true
} }
ksciencePublish{ ksciencePublish{

2
demo/maps/build.gradle.kts
View File

@ -20,7 +20,7 @@ kotlin {
dependencies { dependencies {
implementation(projects.mapsKtCompose) implementation(projects.mapsKtCompose)
implementation(compose.desktop.currentOs) implementation(compose.desktop.currentOs)
implementation("io.ktor:ktor-client-cio:$ktorVersion") implementation("io.ktor:ktor-client-cio")
implementation("ch.qos.logback:logback-classic:1.2.11") implementation("ch.qos.logback:logback-classic:1.2.11")
} }
} }

5
gradle.properties
View File

@ -1,9 +1,8 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.version=1.6.10
compose.version=1.2.0-beta01 compose.version=1.2.0
agp.version=4.2.2 agp.version=4.2.2
android.useAndroidX=true android.useAndroidX=true
toolsVersion=0.13.0-kotlin-1.7.10 toolsVersion=0.13.1-kotlin-1.7.20

13
maps-kt-compose/build.gradle.kts
View File

@ -6,7 +6,6 @@ plugins {
`maven-publish` `maven-publish`
} }
val ktorVersion: String by rootProject.extra
kotlin { kotlin {
explicitApi = org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Warning explicitApi = org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Warning
@ -20,16 +19,16 @@ kotlin {
dependencies { dependencies {
api(projects.mapsKtCore) api(projects.mapsKtCore)
api(compose.foundation) api(compose.foundation)
api("io.ktor:ktor-client-core:$ktorVersion") api(project.dependencies.platform(spclibs.ktor.bom))
api("io.ktor:ktor-client-core")
api("io.github.microutils:kotlin-logging:2.1.23") api("io.github.microutils:kotlin-logging:2.1.23")
} }
} }
val jvmMain by getting{ val jvmMain by getting {
} }
val jvmTest by getting{ val jvmTest by getting {
dependencies { dependencies {
implementation("io.ktor:ktor-client-cio:$ktorVersion") implementation("io.ktor:ktor-client-cio")
implementation(compose.desktop.currentOs) implementation(compose.desktop.currentOs)
implementation(spclibs.kotlinx.coroutines.test) implementation(spclibs.kotlinx.coroutines.test)
@ -42,7 +41,7 @@ kotlin {
} }
} }
java{ java {
targetCompatibility = space.kscience.gradle.KScienceVersions.JVM_TARGET targetCompatibility = space.kscience.gradle.KScienceVersions.JVM_TARGET
} }

3
settings.gradle.kts
View File

@ -16,8 +16,6 @@ pluginManagement {
} }
plugins { plugins {
kotlin("multiplatform").version(extra["kotlin.version"] as String)
kotlin("android").version(extra["kotlin.version"] as String)
id("com.android.application").version(extra["agp.version"] as String) id("com.android.application").version(extra["agp.version"] as String)
id("com.android.library").version(extra["agp.version"] as String) id("com.android.library").version(extra["agp.version"] as String)
id("org.jetbrains.compose").version(extra["compose.version"] as String) id("org.jetbrains.compose").version(extra["compose.version"] as String)
@ -46,7 +44,6 @@ dependencyResolutionManagement {
} }
include( include(
":maps-kt-core", ":maps-kt-core",
":maps-kt-compose", ":maps-kt-compose",