fix: protolib

- Handled all kotlin linting issues - Fixed file/class naming as we now have Java in our gradle - Fixe protosLib gradle file Signed-off-by: Ahmed Moussa <[email protected]>
hyperledger · May 13, 2024 · 957c563 · 957c563
1 parent e19d263
commit 957c563
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 60 deletions.
diff --git a/authenticate-sdk/build.gradle.kts b/authenticate-sdk/build.gradle.kts
@@ -144,4 +144,4 @@ tasks.withType<DokkaTask> {
 //            showStackTraces = true
 //        }
 //    }
-// }
+// }
diff --git a/authenticate-sdk/src/androidMain/kotlin/io/iohk/atala/prism/authenticatesdk/authenticate.kt b/authenticate-sdk/src/androidMain/kotlin/io/iohk/atala/prism/authenticatesdk/authenticate.kt
@@ -1,5 +1,5 @@
 package io.iohk.atala.prism.authenticatesdk
 
-actual fun authenticate(did: String, signature: String, originalText: String):String {
-    return "hola";
+actual fun authenticate(did: String, signature: String, originalText: String): String {
+    return "hola"
 }
diff --git a/...nticate-sdk/src/androidMain/kotlin/io/iohk/atala/prism/authenticatesdk/createChallenge.kt b/...nticate-sdk/src/androidMain/kotlin/io/iohk/atala/prism/authenticatesdk/createChallenge.kt
@@ -1,5 +1,5 @@
 package io.iohk.atala.prism.authenticatesdk
 
 actual fun createChallenge(expiration: Int): String {
-    return "hola";
-}
+    return "hola"
+}
diff --git a/authenticate-sdk/src/commonMain/kotlin/io.iohk.atala.prism.authenticatesdk/authenticate.kt b/authenticate-sdk/src/commonMain/kotlin/io.iohk.atala.prism.authenticatesdk/authenticate.kt
@@ -1,3 +1,3 @@
 package io.iohk.atala.prism.authenticatesdk
 
-expect fun authenticate(did: String, signature: String, originalText: String):String
+expect fun authenticate(did: String, signature: String, originalText: String): String
diff --git a/...enticate-sdk/src/commonMain/kotlin/io.iohk.atala.prism.authenticatesdk/createChallenge.kt b/...enticate-sdk/src/commonMain/kotlin/io.iohk.atala.prism.authenticatesdk/createChallenge.kt
@@ -1,3 +1,3 @@
 package io.iohk.atala.prism.authenticatesdk
 
-expect fun createChallenge(expiration: Int): String
+expect fun createChallenge(expiration: Int): String
diff --git a/authenticate-sdk/src/jsMain/kotlin/JSExport.kt b/authenticate-sdk/src/jsMain/kotlin/JSExport.kt
@@ -11,4 +11,4 @@ fun jsAuthenticate(did: String, signature: String, originalText: String): String
 @JsName("createChallenge")
 fun jsCreateChallenge(expiration: Int): String {
     return createChallenge(expiration)
-}
+}
diff --git a/authenticate-sdk/src/jsMain/kotlin/io.iohk.atala.prism.authenticatesdk/authenticate.kt b/authenticate-sdk/src/jsMain/kotlin/io.iohk.atala.prism.authenticatesdk/authenticate.kt
@@ -1,5 +1,5 @@
 package io.iohk.atala.prism.authenticatesdk
 
-actual fun authenticate(did: String, signature: String, originalText: String):String {
-    return "hola";
+actual fun authenticate(did: String, signature: String, originalText: String): String {
+    return "hola"
 }
diff --git a/authenticate-sdk/src/jsMain/kotlin/io.iohk.atala.prism.authenticatesdk/createChallenge.kt b/authenticate-sdk/src/jsMain/kotlin/io.iohk.atala.prism.authenticatesdk/createChallenge.kt
@@ -1,5 +1,5 @@
 package io.iohk.atala.prism.authenticatesdk
 
 actual fun createChallenge(expiration: Int): String {
-    return "hola";
-}
+    return "hola"
+}
diff --git a/authenticate-sdk/src/jvmMain/kotlin/io/iohk/atala/prism/authenticatesdk/authenticate.kt b/authenticate-sdk/src/jvmMain/kotlin/io/iohk/atala/prism/authenticatesdk/authenticate.kt
@@ -1,5 +1,5 @@
 package io.iohk.atala.prism.authenticatesdk
 
-actual fun authenticate(did: String, signature: String, originalText: String):String {
-    return "hola";
+actual fun authenticate(did: String, signature: String, originalText: String): String {
+    return "hola"
 }
diff --git a/authenticate-sdk/src/jvmMain/kotlin/io/iohk/atala/prism/authenticatesdk/createChallenge.kt b/authenticate-sdk/src/jvmMain/kotlin/io/iohk/atala/prism/authenticatesdk/createChallenge.kt
@@ -1,5 +1,5 @@
 package io.iohk.atala.prism.authenticatesdk
 
 actual fun createChallenge(expiration: Int): String {
-    return "hola";
-}
+    return "hola"
+}
diff --git a/core-sdk/build.gradle.kts b/core-sdk/build.gradle.kts
@@ -235,4 +235,4 @@ tasks.withType<DokkaTask> {
 //            showStackTraces = true
 //        }
 //    }
-// }
+// }
diff --git a/core-sdk/src/androidMain/kotlin/io/iohk/atala/prism/walletcore/Platform.kt b/core-sdk/src/androidMain/kotlin/io/iohk/atala/prism/walletcore/Platform.kt
@@ -3,4 +3,4 @@ package io.iohk.atala.prism.walletcore
 internal actual object Platform {
     actual val OS: String
         get() = "Android ${android.os.Build.VERSION.SDK_INT}"
-}
+}
diff --git a/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt b/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt
@@ -1,8 +1,9 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.okhttp.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.okhttp.OkHttp
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
     config(this)
-}
+}
diff --git a/core-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletcore/AtalaClient.kt b/core-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletcore/AtalaClient.kt
@@ -1,11 +1,14 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
-
-internal expect fun httpClient(config: HttpClientConfig<*>.() -> Unit = {}): HttpClient
+import io.ktor.client.HttpClient
+import io.ktor.client.request.prepareRequest
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.HttpStatement
+import io.ktor.http.ContentType
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpMethod
+import io.ktor.http.URLProtocol
+import io.ktor.http.path
 
 class AtalaClient(
     private val baseURL: String,
@@ -20,7 +23,7 @@ class AtalaClient(
         httpHeaders: Map<String, String> = mapOf()
     ): HttpStatement {
         return client.prepareRequest {
-            for(header in httpHeaders) {
+            for (header in httpHeaders) {
                 if (
                     httpMethod == HttpMethod.Get &&
                     header.key == HttpHeaders.ContentType &&
@@ -58,6 +61,7 @@ class AtalaClient(
      */
 }
 
+/*
 fun AtalaClient.login() {
 
 }
@@ -69,4 +73,5 @@ suspend fun x() {
         ""
     )
     request.execute()
-}
+}
+*/
diff --git a/core-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt b/core-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt
@@ -2,4 +2,4 @@ package io.iohk.atala.prism.walletcore
 
 internal expect object Platform {
     val OS: String
-}
+}
diff --git a/core-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletcore/httpClient.kt b/core-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletcore/httpClient.kt
@@ -0,0 +1,7 @@
+package io.iohk.atala.prism.walletcore
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+
+
+internal expect fun httpClient(config: HttpClientConfig<*>.() -> Unit = {}): HttpClient
diff --git a/core-sdk/src/iosMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt b/core-sdk/src/iosMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt
@@ -5,4 +5,4 @@ import platform.UIKit.UIDevice
 internal actual object Platform {
     actual val OS: String
         get() = "${UIDevice.currentDevice.systemName()}-${UIDevice.currentDevice.systemVersion}"
-}
+}
diff --git a/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk.atala.prism.walletcore/httpClient.kt b/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk.atala.prism.walletcore/httpClient.kt
@@ -1,7 +1,8 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.darwin.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.darwin.Darwin
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
     config(this)
@@ -10,4 +11,4 @@ internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpCli
             setAllowsCellularAccess(true)
         }
     }
-}
+}
diff --git a/core-sdk/src/jsMain/kotlin/io/iohk/atala/prism/walletcore/Platform.kt b/core-sdk/src/jsMain/kotlin/io/iohk/atala/prism/walletcore/Platform.kt
@@ -8,4 +8,4 @@ internal actual object Platform {
         } else {
             "JS"
         }
-}
+}
diff --git a/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt b/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt
@@ -1,8 +1,9 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.js.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.js.Js
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Js) {
     config(this)
-}
+}
diff --git a/core-sdk/src/jvmMain/kotlin/io/iohk/atala/prism/walletcore/Platform.kt b/core-sdk/src/jvmMain/kotlin/io/iohk/atala/prism/walletcore/Platform.kt
@@ -3,4 +3,4 @@ package io.iohk.atala.prism.walletcore
 internal actual object Platform {
     actual val OS: String
         get() = "JVM - ${System.getProperty("java.version")}"
-}
+}
diff --git a/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt b/...ohk/atala/prism/walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt
@@ -1,8 +1,9 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.okhttp.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.okhttp.OkHttp
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
     config(this)
-}
+}
diff --git a/core-sdk/src/macosX64Main/kotlin/io/iohk/atala/prism/walletcore/Platform.kt b/core-sdk/src/macosX64Main/kotlin/io/iohk/atala/prism/walletcore/Platform.kt
@@ -8,4 +8,4 @@ internal actual object Platform {
             val processInfo = NSProcessInfo.processInfo()
             return "${processInfo.operatingSystemName()}-${processInfo.operatingSystemVersionString()}"
         }
-}
+}
diff --git a/...ohk.atala.prism.walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt b/...ohk.atala.prism.walletcore/AtalaClient.kt → ...iohk/atala/prism/walletcore/httpClient.kt
@@ -1,7 +1,8 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.darwin.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.darwin.Darwin
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
     config(this)
@@ -10,4 +11,4 @@ internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpCli
             setAllowsCellularAccess(true)
         }
     }
-}
+}
diff --git a/core-sdk/src/tvosMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt b/core-sdk/src/tvosMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt
@@ -5,4 +5,4 @@ import platform.UIKit.UIDevice
 internal actual object Platform {
     actual val OS: String
         get() = "${UIDevice.currentDevice.systemName()}-${UIDevice.currentDevice.systemVersion}"
-}
+}
diff --git a/...ohk.atala.prism.walletcore/AtalaClient.kt → ...iohk.atala.prism.walletcore/httpClient.kt b/...ohk.atala.prism.walletcore/AtalaClient.kt → ...iohk.atala.prism.walletcore/httpClient.kt
@@ -1,7 +1,8 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.darwin.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.darwin.Darwin
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
     config(this)
@@ -10,4 +11,4 @@ internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpCli
             setAllowsCellularAccess(true)
         }
     }
-}
+}
diff --git a/core-sdk/src/watchosMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt b/core-sdk/src/watchosMain/kotlin/io.iohk.atala.prism.walletcore/Platform.kt
@@ -8,4 +8,4 @@ internal actual object Platform {
             val wkInterfaceDevice = WKInterfaceDevice.currentDevice()
             return "${wkInterfaceDevice.systemName}-${wkInterfaceDevice.systemVersion}"
         }
-}
+}
diff --git a/...ohk.atala.prism.walletcore/AtalaClient.kt → ...iohk.atala.prism.walletcore/httpClient.kt b/...ohk.atala.prism.walletcore/AtalaClient.kt → ...iohk.atala.prism.walletcore/httpClient.kt
@@ -1,7 +1,8 @@
 package io.iohk.atala.prism.walletcore
 
-import io.ktor.client.*
-import io.ktor.client.engine.darwin.*
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.darwin.Darwin
 
 internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
     config(this)
@@ -10,4 +11,4 @@ internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpCli
             setAllowsCellularAccess(true)
         }
     }
-}
+}
diff --git a/protosLib/build.gradle.kts b/protosLib/build.gradle.kts
@@ -1,5 +1,7 @@
+import com.google.protobuf.gradle.id
+import com.google.protobuf.gradle.proto
+import com.google.protobuf.gradle.remove
 import org.gradle.internal.os.OperatingSystem
-import com.google.protobuf.gradle.*
 
 val os: OperatingSystem = OperatingSystem.current()
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,7 +24,6 @@ buildscript {
     }
 }
 
-
 rootProject.name = "wallet-sdk"
 include(":protosLib")
 include(":wallet-sdk")

diff --git a/wallet-sdk/build.gradle.kts b/wallet-sdk/build.gradle.kts
@@ -205,4 +205,4 @@ tasks.withType<DokkaTask> {
 //            showStackTraces = true
 //        }
 //    }
-// }
+// }
diff --git a/wallet-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletsdk/WalletSDK.kt b/wallet-sdk/src/commonMain/kotlin/io.iohk.atala.prism.walletsdk/WalletSDK.kt
@@ -1,5 +1,3 @@
 package io.iohk.atala.prism.walletsdk
 
-final class WalletSDK {
-
-}
+final class WalletSDK
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,4 +144,4 @@ tasks.withType<DokkaTask> { @@
     //            showStackTraces = true
     //        }
     //    }
-    // }
+    // }