Merge pull request #9 from highmobility/remove-gildor

Remove gildor

README.md

@@ -37,7 +37,7 @@ owner package.
 
 ### Deployment
 
-check `./gradle/deploy-ossrh.gradle`
+check `./gradle/deploy-process.md`
 
 ### License
 

gradle.properties

@@ -1,2 +1,2 @@
 version=0.6.2
-kotlin.code.style=official
+kotlin.code.style=official

gradle/deploy-process.md

@@ -1,3 +1,8 @@
+# Public release
+
+Release is done via Github actions. We increment release number manually and then create a tag which starts the release
+action. We don't do automatic releases on every push in order to reduce release count if there are no real changes.
+
 - update CHANGELOG.md
 - merge a pull request
 - update version and create a tag. use either of these
@@ -8,4 +13,11 @@
     - **manually**
         - update version in `$projectRoot/gradle.properties` and push tag manually
 - create a release in GitHub. Package is pushed to OSSRH staging automatically.
-- close and release manually in OSSRH staging.
+- close and release manually in OSSRH staging.
+
+## Make a test release locally to staging
+
+- comment out line `useInMemoryPgpKeys(signingKey, signingPassword)` in deploy-ossrh.gradle
+- Update version in `$projectRoot/gradle.properties` and call `./gradlew -Prelease :hmkit-fleet:publishToSonatype`.
+- Don't merge test version names to main. Public versions are managed via Github Actions.
+- Check the package in staging URL in OSSRH.

hmkit-fleet/build.gradle

@@ -11,6 +11,10 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_17
 }
 
+test {
+    testLogging.exceptionFormat = 'full'
+}
+
 // publish settings
 apply from: "../gradle/deploy-ossrh.gradle"
 apply from: "https://raw.githubusercontent.com/tonisives/tools/master/scripts/jupiter-test-shell-logging.gradle"
@@ -31,7 +35,6 @@ dependencies {
 
     // web
     implementation('com.squareup.okhttp3:okhttp:4.10.0')
-    implementation("ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0")
 
     // Koin
     implementation "io.insert-koin:koin-core:$koinVersion"

hmkit-fleet/src/main/kotlin/network/AccessCertificateRequests.kt

@@ -35,7 +35,7 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.slf4j.Logger
-import ru.gildor.coroutines.okhttp.await
+import utils.await
 import java.net.HttpURLConnection
 
 internal class AccessCertificateRequests(

hmkit-fleet/src/main/kotlin/network/AccessTokenRequests.kt

@@ -32,7 +32,7 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.slf4j.Logger
-import ru.gildor.coroutines.okhttp.await
+import utils.await
 import java.net.HttpURLConnection
 
 internal class AccessTokenRequests(

hmkit-fleet/src/main/kotlin/network/AuthTokenRequests.kt

@@ -37,7 +37,7 @@ import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.slf4j.Logger
-import ru.gildor.coroutines.okhttp.await
+import utils.await
 import java.net.HttpURLConnection
 
 internal class AuthTokenRequests(

hmkit-fleet/src/main/kotlin/network/ClearanceRequests.kt

@@ -34,7 +34,7 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.slf4j.Logger
-import ru.gildor.coroutines.okhttp.await
+import utils.await
 import java.net.HttpURLConnection
 
 internal class ClearanceRequests(

hmkit-fleet/src/main/kotlin/network/TelematicsRequests.kt

@@ -36,7 +36,7 @@ import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.slf4j.Logger
-import ru.gildor.coroutines.okhttp.await
+import utils.await
 import java.net.HttpURLConnection
 
 internal class TelematicsRequests(

hmkit-fleet/src/main/kotlin/utils/CallAwait.kt

@@ -0,0 +1,34 @@
+package utils
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Response
+import java.io.IOException
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+suspend fun Call.await(): Response {
+    return suspendCancellableCoroutine { continuation ->
+        enqueue(object : Callback {
+            override fun onResponse(call: Call, response: Response) {
+                continuation.resume(response)
+            }
+
+            override fun onFailure(call: Call, e: IOException) {
+                // Don't bother with resuming the continuation if it is already cancelled.
+                if (continuation.isCancelled) return
+                continuation.resumeWithException(e)
+            }
+        })
+
+        continuation.invokeOnCancellation {
+            try {
+                cancel()
+            } catch (ex: Throwable) {
+                //Ignore cancel exception
+            }
+        }
+    }
+}