diff --git a/build.gradle.kts b/build.gradle.kts index 47870a4..2cc6dcd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,11 +6,13 @@ plugins { id("space.kscience.gradle.project") } -val ktorVersion by extra("2.0.3") - allprojects { group = "center.sciprog" - version = "0.1.0-dev-13" + version = "0.1.0" +} + +apiValidation{ + validationDisabled = true } ksciencePublish{ diff --git a/demo/maps/build.gradle.kts b/demo/maps/build.gradle.kts index 2b70922..719078c 100644 --- a/demo/maps/build.gradle.kts +++ b/demo/maps/build.gradle.kts @@ -20,7 +20,7 @@ kotlin { dependencies { implementation(projects.mapsKtCompose) 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") } } diff --git a/gradle.properties b/gradle.properties index d1dc9fa..53180c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,8 @@ 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 android.useAndroidX=true -toolsVersion=0.13.0-kotlin-1.7.10 \ No newline at end of file +toolsVersion=0.13.1-kotlin-1.7.20 \ No newline at end of file diff --git a/maps-kt-compose/build.gradle.kts b/maps-kt-compose/build.gradle.kts index db30e02..a6e2a70 100644 --- a/maps-kt-compose/build.gradle.kts +++ b/maps-kt-compose/build.gradle.kts @@ -6,7 +6,6 @@ plugins { `maven-publish` } -val ktorVersion: String by rootProject.extra kotlin { explicitApi = org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Warning @@ -20,16 +19,16 @@ kotlin { dependencies { api(projects.mapsKtCore) 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") } } - val jvmMain by getting{ - + val jvmMain by getting { } - val jvmTest by getting{ + val jvmTest by getting { dependencies { - implementation("io.ktor:ktor-client-cio:$ktorVersion") + implementation("io.ktor:ktor-client-cio") implementation(compose.desktop.currentOs) implementation(spclibs.kotlinx.coroutines.test) @@ -42,7 +41,7 @@ kotlin { } } -java{ +java { targetCompatibility = space.kscience.gradle.KScienceVersions.JVM_TARGET } diff --git a/settings.gradle.kts b/settings.gradle.kts index 665ae67..dd64150 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,8 +16,6 @@ pluginManagement { } 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.library").version(extra["agp.version"] as String) id("org.jetbrains.compose").version(extra["compose.version"] as String) @@ -46,7 +44,6 @@ dependencyResolutionManagement { } - include( ":maps-kt-core", ":maps-kt-compose",