From 59b7310385fb935d21c614b09dc63a66d8af0f39 Mon Sep 17 00:00:00 2001 From: sergeych Date: Thu, 27 Mar 2025 00:06:30 +0300 Subject: [PATCH] version bump --- .gitignore | 1 + build.gradle.kts | 25 ++++++++++++++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 1 + .../kiloparsec/adapter/websocketClient.kt | 9 ++++--- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9c2bce0..7fa6c66 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ out/ .kotlin /.idea/workspace.xml /.gigaide/gigaide.properties +local.properties diff --git a/build.gradle.kts b/build.gradle.kts index 45e80b6..56e3379 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,17 +8,20 @@ * real dot sergeych at gmail. */ +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { kotlin("multiplatform") version "2.1.0" id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" + id("com.android.library") version "8.5.2" apply true `maven-publish` id("org.jetbrains.dokka") version "1.9.20" } group = "net.sergeych" -version = "0.6.6" +version = "0.6.8-SNAPSHOT" repositories { mavenCentral() @@ -50,7 +53,7 @@ kotlin { browser() } - val ktor_version = "3.1.0" + val ktor_version = "3.1.1" sourceSets { all { @@ -67,6 +70,11 @@ kotlin { api("net.sergeych:crypto2:0.8.3") } } + val androidMain by getting { + dependencies { + implementation("io.ktor:ktor-client-okhttp:$ktor_version") + } + } val ktorSocketMain by creating { dependsOn(commonMain) dependencies { @@ -96,7 +104,6 @@ kotlin { val jvmTest by getting { dependsOn(ktorSocketTest) } - val jsMain by getting { dependencies { implementation("io.ktor:ktor-client-js:$ktor_version") @@ -166,3 +173,15 @@ tasks.dokkaHtml.configure { } } +android { + namespace = "net.sergeych.kiloparsec" + compileSdk = 34 + defaultConfig { + minSdk = 24 + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e287ab..f364ac3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -10,6 +10,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 617937d..52b13c7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,6 +10,7 @@ pluginManagement { repositories { + google() mavenCentral() gradlePluginPortal() } diff --git a/src/commonMain/kotlin/net/sergeych/kiloparsec/adapter/websocketClient.kt b/src/commonMain/kotlin/net/sergeych/kiloparsec/adapter/websocketClient.kt index 74a968a..17aba30 100644 --- a/src/commonMain/kotlin/net/sergeych/kiloparsec/adapter/websocketClient.kt +++ b/src/commonMain/kotlin/net/sergeych/kiloparsec/adapter/websocketClient.kt @@ -54,7 +54,9 @@ fun websocketClient( */ fun websocketTransportDevice( path: String, - client: HttpClient = HttpClient { install(WebSockets) }, + client: HttpClient = HttpClient { + install(WebSockets) + }, ): Transport.Device { var u = Url(path) if (u.encodedPath.length <= 1) @@ -126,9 +128,8 @@ fun websocketTransportDevice( runCatching { input.close() } runCatching { close() } } - } - catch(x: IOException) { - if( "refused" in x.toString()) log.debug { "connection refused" } + } catch (x: IOException) { + if ("refused" in x.toString()) log.debug { "connection refused" } else log.warning { "unexpected IO error $x" } runCatching { output.close() } runCatching { input.close() }