Skip to content

Commit 2544187

Browse files
hamada147hamada147
committed
build: update version
- update kotlin - code enhancements
1 parent 03a97f3 commit 2544187

7 files changed

Lines changed: 19 additions & 58 deletions

File tree

‎didcomm/build.gradle.kts‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ kotlin {
4242
this.moduleName = currentModuleName
4343
this.binaries.library()
4444
this.useCommonJs()
45+
generateTypeScriptDefinitions()
4546
this.compilations["main"].packageJson {
4647
this.version = rootProject.version.toString()
4748
}
@@ -53,25 +54,14 @@ kotlin {
5354
this.output.library = currentModuleName
5455
this.output.libraryTarget = Target.VAR
5556
}
56-
this.commonWebpackConfig {
57-
this.cssSupport {
58-
this.enabled = true
59-
}
60-
}
6157
this.testTask {
62-
if (os.isWindows) {
63-
this.enabled = false
64-
}
6558
this.useKarma {
6659
this.useChromeHeadless()
6760
}
6861
}
6962
}
7063
nodejs {
7164
this.testTask {
72-
if (os.isWindows) {
73-
this.enabled = false
74-
}
7565
this.useKarma {
7666
this.useChromeHeadless()
7767
}
@@ -192,23 +182,11 @@ android {
192182
tasks.withType<DokkaTask> {
193183
moduleName.set(project.name)
194184
moduleVersion.set(rootProject.version.toString())
195-
description = """
196-
This is a Kotlin Multiplatform Library for Mercury
197-
""".trimIndent()
185+
description = "This is a Kotlin Multiplatform Library for Mercury"
198186
dokkaSourceSets {
199187
// TODO: Figure out how to include files to the documentations
200188
named("commonMain") {
201189
includes.from("Module.md", "docs/Module.md")
202190
}
203191
}
204192
}
205-
206-
// afterEvaluate {
207-
// tasks.withType<AbstractTestTask> {
208-
// testLogging {
209-
// events("passed", "skipped", "failed", "standard_out", "standard_error")
210-
// showExceptions = true
211-
// showStackTraces = true
212-
// }
213-
// }
214-
// }

‎didcomm/didcomm.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'didcomm'
3-
spec.version = '1.0.3-alpha'
3+
spec.version = '1.0.4-alpha'
44
spec.homepage = ''
55
spec.source = { :http=> ''}
66
spec.authors = 'IOG'

‎didpeer/build.gradle.kts‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ kotlin {
4343
this.moduleName = currentModuleName
4444
this.binaries.library()
4545
this.useCommonJs()
46+
generateTypeScriptDefinitions()
4647
this.compilations["main"].packageJson {
4748
this.version = rootProject.version.toString()
4849
}
@@ -54,25 +55,14 @@ kotlin {
5455
this.output.library = currentModuleName
5556
this.output.libraryTarget = Target.VAR
5657
}
57-
this.commonWebpackConfig {
58-
this.cssSupport {
59-
this.enabled = true
60-
}
61-
}
6258
this.testTask {
63-
if (os.isWindows) {
64-
this.enabled = false
65-
}
6659
this.useKarma {
6760
this.useChromeHeadless()
6861
}
6962
}
7063
}
7164
nodejs {
7265
this.testTask {
73-
if (os.isWindows) {
74-
this.enabled = false
75-
}
7666
this.useKarma {
7767
this.useChromeHeadless()
7868
}
@@ -98,10 +88,10 @@ kotlin {
9888
sourceSets {
9989
val commonMain by getting {
10090
dependencies {
101-
implementation("io.iohk.atala.prism.apollo:multibase:1.7.0-alpha")
102-
implementation("io.iohk.atala.prism.apollo:varint:1.7.0-alpha")
103-
implementation("io.iohk.atala.prism.apollo:base64:1.7.0-alpha")
104-
implementation("io.iohk.atala.prism.apollo:base58:1.7.0-alpha")
91+
implementation("io.iohk.atala.prism.apollo:multibase:1.0.2")
92+
implementation("io.iohk.atala.prism.apollo:varint:1.0.2")
93+
implementation("io.iohk.atala.prism.apollo:base64:1.0.2")
94+
implementation("io.iohk.atala.prism.apollo:base58:1.0.2")
10595
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
10696
implementation("com.squareup.okio:okio:3.2.0")
10797
}
@@ -197,23 +187,11 @@ android {
197187
tasks.withType<DokkaTask> {
198188
moduleName.set(project.name)
199189
moduleVersion.set(rootProject.version.toString())
200-
description = """
201-
This is a Kotlin Multiplatform Library for Mercury DIDPeer
202-
""".trimIndent()
190+
description = "This is a Kotlin Multiplatform Library for Mercury DIDPeer"
203191
dokkaSourceSets {
204192
// TODO: Figure out how to include files to the documentations
205193
named("commonMain") {
206194
includes.from("Module.md", "docs/Module.md")
207195
}
208196
}
209197
}
210-
211-
// afterEvaluate {
212-
// tasks.withType<AbstractTestTask> {
213-
// testLogging {
214-
// events("passed", "skipped", "failed", "standard_out", "standard_error")
215-
// showExceptions = true
216-
// showStackTraces = true
217-
// }
218-
// }
219-
// }

‎didpeer/didpeer.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'didpeer'
3-
spec.version = '1.0.3-alpha'
3+
spec.version = '1.0.4-alpha'
44
spec.homepage = ''
55
spec.source = { :http=> ''}
66
spec.authors = 'IOG'

‎didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/DIDDoc.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import io.iohk.atala.prism.didcomm.didpeer.core.toJsonElement
55
import kotlinx.serialization.Serializable
66
import kotlinx.serialization.json.Json
77
import kotlinx.serialization.json.jsonObject
8+
import kotlin.jvm.JvmOverloads
89

910
const val SERVICE_ID = "id"
1011
const val SERVICE_TYPE = "type"
@@ -14,7 +15,7 @@ const val SERVICE_ROUTING_KEYS = "routingKeys"
1415
const val SERVICE_ACCEPT = "accept"
1516

1617
@Serializable
17-
data class DIDDocPeerDID(
18+
data class DIDDocPeerDID @JvmOverloads constructor(
1819
val did: String,
1920
val authentication: List<VerificationMethodPeerDID>,
2021
val keyAgreement: List<VerificationMethodPeerDID> = emptyList(),

‎didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/Exceptions.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
package io.iohk.atala.prism.didcomm.didpeer
22

3+
import kotlin.jvm.JvmOverloads
4+
35
/**
46
* The base class for all PeerDID errors and exceptions.
57
*
68
* @param message - the detail message.
79
* @param cause - the cause of this.
810
*/
9-
open class PeerDIDException(message: String, cause: Throwable? = null) : Throwable(message, cause)
11+
open class PeerDIDException @JvmOverloads constructor(message: String, cause: Throwable? = null) : Throwable(message, cause)
1012

1113
/**
1214
* Raised if the peer DID to be resolved in not a valid peer DID.
1315
*
1416
* @param message - the detail message.
1517
* @param cause - the cause of this.
1618
*/
17-
class MalformedPeerDIDException(message: String, cause: Throwable? = null) :
19+
class MalformedPeerDIDException @JvmOverloads constructor(message: String, cause: Throwable? = null) :
1820
PeerDIDException("Invalid peer DID provided. $message", cause)
1921

2022
/**
2123
* Raised if the resolved peer DID Doc to be resolved in not a valid peer DID.
2224
*
2325
* @param cause - the cause of this.
2426
*/
25-
class MalformedPeerDIDDOcException(cause: Throwable? = null) :
27+
class MalformedPeerDIDDOcException @JvmOverloads constructor(cause: Throwable? = null) :
2628
PeerDIDException("Invalid peer DID Doc", cause)

‎didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/PeerDIDResolver.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import io.iohk.atala.prism.didcomm.didpeer.core.getVerificationMethod
99
import io.iohk.atala.prism.didcomm.didpeer.core.validateAgreementMaterialType
1010
import io.iohk.atala.prism.didcomm.didpeer.core.validateAuthenticationMaterialType
1111
import kotlin.jvm.JvmName
12+
import kotlin.jvm.JvmOverloads
1213

1314
/** Resolves [DIDDocPeerDID] from [PeerDID]
1415
* @param [peerDID] PeerDID to resolve
@@ -18,6 +19,7 @@ import kotlin.jvm.JvmName
1819
* - if a valid DIDDoc cannot be produced from the [peerDID]
1920
* @return resolved [DIDDocPeerDID] as JSON string
2021
*/
22+
@JvmOverloads
2123
fun resolvePeerDID(
2224
peerDID: PeerDID,
2325
format: VerificationMaterialFormatPeerDID = VerificationMaterialFormatPeerDID.MULTIBASE

0 commit comments

Comments
 (0)